🔗 git rebase or git merge? Neither.

I just watched some people argue about this, and I didn’t hear anyone describe my favourite solution, so I’ll describe it here. It leaves a perfect trail of breadcrumbs so if I make mistake, I can always rollback. Hopefully, it saves you some time and pain.

In this scenario, I’ve been working in my feature branch for two weeks. Of course, lots of changes have been committed to the main branch while I’ve been working in my feature branch. Now it’s time to pull changes from main.

> git status
On branch feature
nothing to commit, working tree clean
> git checkout main
> git pull
> git checkout -b feature2
> git merge --squash feature

And then I resume my work in the feature2 branch.