so `git rebase HEAD~5..HEAD --onto other-branch-with-3-new-commits` ? And now you have conflicts, how is that weird? I can't think of a magic tool which would g

so `git rebase HEAD~5..HEAD --onto other-branch-with-3-new-commits` ? And now you have conflicts, how is that weird? I can't think of a magic tool which would guarantee you a conflict-free solution with your described scenario. What I don't understand is that, iiuc, you do not get conflicts with your stashing approach. Again, iiuc, this would result in the same conflicts as the rebase way, if not, you're not telling us something important in the way your are rebasing.