Skip to content

Branch develop is in a screwed-up state #2033

@tig

Description

@tig

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:

After that, the following commits to develop are suspect:

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:

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....

Metadata

Metadata

Assignees

Labels

build-and-deployIssues regarding to building and deploying Terminal.Gui

Type

No type

Projects

No projects

Milestone

No milestone

Relationships

None yet

Development

No branches or pull requests

Issue actions