squash can sometimes fail

[barrettj12]

$ jit squash
squashing against "main" commit de7a205f5a...
error: could not apply 3d3e44e93c... refactor(apiserver): wire provider factory through apiserver
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Could not apply 3d3e44e93c... refactor(apiserver): wire provider factory through apiserver

exit status 1

We shouldn't have to worry about this. Better if we just reset to the merge base and commit all changes as a single commit.

[barrettj12]

The better way is

• create a new temp branch
• on the new branch, git merge --squash <old-branch>
• commit all changes
• reset the old branch to the new branch's HEAD

[barrettj12]

These links may describe the conditions under which this can occur:

• https://stackoverflow.com/questions/3133449/why-does-git-rebase-give-me-merge-conflicts-when-all-im-doing-is-squashing-comm
• https://stackoverflow.com/questions/66781935/git-rebase-squashing-all-commits-how-can-conflicts-occur