Whose version of f is now in the working tree?
$ git switch feat $ git rebase main CONFLICT (content): Merge conflict in f $ git checkout --ours f
- The common ancestor's
- The last stashed version
- The version from
feat - The version from
main
A rebase replays
Play Git ▸
feat commits onto main, so "ours" is the branch being built on (main) and "theirs" is the commit being replayed. The roles are swapped compared with a merge.