cswinter
commented
2 years ago Looks like it will merge cleanly anyway, but two strategies I employ in cases like this:
- do interactive rebase to first squash all the now-merged commits before rebasing onto main
- create a new branch off main, and then cherry-pick just the new commits
not sure why the commit history has a bunch of commits you made .... tried to rebase but got scared pretty quickly