How to get & ldquo; their & rdquo; changes in the middle of Git rebase in conflict?


I have conflicting branches, branch2 branched from branch1.

Let's say when rebasing branch2 on current branch1, while resolving conflicts, I decide to take some (not all) of "their" (i.e. branch1) files as-is. How do I do that?

I tried:

git checkout branch1:foo/
fatal: reference is not a tree: TS-modules-tmp:foo/

git checkout refs/heads/branch1:foo/
fatal: reference is not a tree: refs/heads/TS-modules-tmp:foo/

You want to use:

git checkout --ours foo/
git add foo/

If you rebase a branch feature_x on master, during rebasing ours refers to the master and theirs to feature_x.

As pointed out in the git-rebase docs:

Note that a rebase merge works by replaying each commit from the working branch on top of the branch. Because of this, when a merge conflict happens, the side reported as ours is the so-far rebased series, starting with <upstream>, and theirs is the working branch. In other words, the sides are swapped.

For further details read this thread.