-
Couldn't load subscription status.
- Fork 725
Description
Yesterday, as I was fixing #2027 I somehow merged an old main branch into develop.
This caused a bunch of PRs that I was also reviewing and merging to get screwed up.
So, right now, the develop branch is pretty much hosed.
This Issue documents my progress in trying to fix all of this.
What I know so far:
mainis fine. I've reviewed the history and the fixes to the API documentation are the only changes since the v1.7.2 tag.- Link to tag: https://github.com/gui-cs/Terminal.Gui/releases/tag/v1.7.2
- Link to commit for tag: 8e20fb7
- The error occurred when I attempted to pull
mainforward intodevelopwhen I merged this PR: Fixes #2025 - API Docs are now generated via Github Action - View Source Works #2027. The commit was: a45314e. - So,
developwas in a good state at the commit prior to that, which was b7ecb82
After that, the following commits to develop are suspect:
- Merge branch 'develop' of tig:gui-cs/Terminal.Gui into develop - befb063
- This commit occurred when I merged PR Bring
develophistory up to date withmain#2028 (6d3d5cc) - It appears to bring a bunch of old/bogus stuff in
- This commit occurred when I merged PR Bring
Now, the job is to go through all the subsequent PRs & commits and ensure that all the good work @BDisp did after that gets re-merged...
Here are the impacted commits:
- Merge branch 'develop' of tig:gui-cs/Terminal.Gui into develop: b7ecb82
- Includes the changes @BDisp put in to fix Application mouseGrabView is run twice if return true. #2014 (PR Fixes #2014. Application mouseGrabView is run twice if return true. #2015)
- Removed docs folder because gh-pages branch is now used: 9d1e9c9
- Ignore ./docs folder: 0321b25
- Fixes Create a a flag to set if the view must be cleared or not on Visible as false. #2026. Added ClearOnVisibleFalse to flag if the view must be clear…: 281a849
- Fixes API Docs "View Source" link broken #2025 - API Docs are now generated via Github Action - View Source… : c6001c7
- Puts API doc overrides in ./docfx/overrides folder: 18c8603
I've created a new branch, develop_pre_screwup, at b7ecb82.
I'm now going to re-create #2014, #2020, #2027, and #2029 on that branch...
Please check my math if you're paying attention....