Haven't merged master -> develop in a while - opening PR to look at conflicts

robertlugg / easygui

easygui for Python

http://easygui.readthedocs.org/en/master/

BSD 3-Clause "New" or "Revised" License

451 stars 114 forks source link

Closed zadacka closed 2 years ago

zadacka commented 2 years ago

I've been falling into an anti-pattern of going feature -> master.

This has facilitated some fix PRs, but has also resulted in some master changes now conflicting with develop.

Opening this PR to see how much divergence there is...

zadacka commented 2 years ago

I think that we're going to need to abort this, and then cherry pick 'feature' fixes from develop across.

Proposal:

shelve (rename!) current develop branch to feature/button_box_improvements <- the source of most merge conflicts
make a new develop branch from master
cherry pick the bits that we want from the old (renamed) develop branch to the new develop branch