#merge

"ours" and "theirs" mean opposite things depending on whether you're merging or rebasing — because rebase replays your own commits as if they were incoming patches onto a different HEAD. Every combination, in one place.

Git stops and asks you to decide when the same lines were changed on both sides. Here's the sequence that gets you out cleanly.

Combines another branch's changes into your current branch, preserving both branches' history as-is.