This can be confusing: > $ git checkout merge-into-ours # current branch is "ours" The current branch is now "merge-into-ours", not "ours". Except it is also

This can be confusing: > $ git checkout merge-into-ours # current branch is "ours" The current branch is now "merge-into-ours", not "ours". Except it is also "ours". The next example adds to the confusion: > $ git checkout theirs # current branch is "theirs" At least, there should be a consistency and both branches should be either called "merge-into-ours" and "rebase-into-theirs", or "ours" and "theirs".