How to get their changes in the middle of conflicting Git rebase

Question

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 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

User · Answer

If you want to pull a particular file from another branch just do  git checkout branch1 -- filenamefoo txt   This will pull a version of the file from one branch into the current tree

User · Answer

You want to use  git checkout --ours foo bar java git add foo bar java  If you rebase a branch feature x against main  i e  running git rebase main while on branch feature x   during rebasing ours refers to main 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  lt upstream gt   and theirs is the working branch  In other words  the sides are swapped   For further details read this thread

[git] How to get "their" changes in the middle of conflicting Git rebase?

Examples related to git

Examples related to rebase

Examples related to git-rebase