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?
git checkout branch1:foo/bar.java
fatal: reference is not a tree: TS-modules-tmp:foo/bar.java
git checkout refs/heads/branch1:foo/bar.java
fatal: reference is not a tree: refs/heads/TS-modules-tmp:foo/bar.java