KnowledgeHub
Questions
Tags
Users
Search
Alex Rivera
|
Logout
Edit Question
Title
Body
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 don't properly understand the paradigm. When rebasing, who is 'local' and who is 'remote'? (I use P4Merge for resolving conflicts.)
Tags (comma-separated)
Save Edits
Cancel