如何仅拉取冲突文件来解决Git合并冲突？

Great question—this is such a common annoyance when you don't want your feature branch cluttered with unrelated changes just to fix a couple of merge conflicts. Let's walk through a couple of simple, effective ways to tackle this:

Method 1: Checkout Conflicting Files Directly from the Release Branch #

If you've already hit conflicts (or even want to proactively grab the latest version of a file you know will conflict), you can pull just the specific file from the remote release branch:

• First, identify which files are conflicting. Run:

  git status
  

  This will list all files marked as both modified—those are your conflicted files.

• For each conflicting file, fetch its version from the release branch using:

  git checkout origin/<release-branch> -- path/to/your/conflicting-file.ext
  

  This replaces your local feature branch's version of the file with the one from the remote release branch. Now you can open the file, resolve the conflicts manually, then stage and commit it as usual.

Method 2: Partial Merge (Avoid Unrelated Files Entirely) #

If you haven't run git pull yet, you can do a targeted merge that only keeps the conflicting changes, discarding everything else you don't need:

• First, fetch the latest changes from the remote without merging them into your branch:

  git fetch origin <release-branch>
  

• Start a merge but tell Git not to auto-commit or fast-forward:

  git merge --no-commit --no-ff origin/<release-branch>
  

  Git will attempt to merge the branches, and any conflicts will show up as expected.

• Now, reset all non-conflicting files back to your feature branch's original state (this leaves only the conflicted files in an unmerged state):

  git reset HEAD -- .
  git checkout -- .
  

  Double-check with git status—you should see only your conflicted files listed as needing resolution.

• Resolve the conflicts in those remaining files, stage them, and commit the merge:

  git add path/to/conflicting-file.ext
  git commit -m "Resolve merge conflicts with release branch (only conflicting files updated)"
  

Quick Note on Why git pull Brings All Files #

Just to clear up the confusion: git pull origin <release-branch> is basically a shortcut for git fetch origin <release-branch> plus git merge origin <release-branch>. Merging combines the entire commit history of the release branch into your feature branch, which is why every file gets updated—even the ones you never touched. The methods above let you cherry-pick only the changes you need to fix conflicts without pulling in unrelated clutter.

内容的提问来源于stack exchange，提问作者Rahul Raj