Gregory's Server@b0rk oh yes. Most confusing to me is the "ours" and "theirs" terminology when resolving merge conflicts.
|
3 comments
|
|
Top-level
@b0rk oh yes. Most confusing to me is the "ours" and "theirs" terminology when resolving merge conflicts. 3 comments
|
@lea @b0rk The trick with "ours" and "theirs" is to remember that git was written by Linus, whose workflow involves rebasing other people's patches onto his `main` branch.
So, despite the fact that you had some feature branch checked out when you started, "ours" is main (because you're Linus) and "theirs" is the feature branch (written by the person about to get cussed out on the LKML).