When doing a git rebase, I often have difficulty working out what is happening with the ‘local’ and ‘remote’ when resolving conflicts. I sometimes have the impression that they swap sides from one commit to the next.
This is probably (definitely) because I still haven’t properly understood.
When rebasing, who is ‘local’ and who is ‘remote’?
(I use P4Merge for resolving conflicts)
