假设B是当前分支:

$ git diff A <file-path> > patch.tmp
$ git apply patch.tmp -R

注意，这只对本地文件应用更改。之后你需要做出承诺。

下面的命令将 (1)比较文件的正确分支，以掌握 (2)交互式地询问您应用哪些修改。

git checkout --patch master <fn>

git checkout <target_branch>
git checkout <source_branch> <file_path>

你可以用:

git merge-file

提示:https://www.kernel.org/pub/software/scm/git/docs/git-merge-file.html

我的编辑被拒绝了，所以我附上了如何从远程分支处理合并更改在这里。

如果你必须在错误的合并后这样做，你可以这样做:

# If you did a git pull and it broke something, do this first
# Find the one before the merge, copy the SHA1
git reflog
git reset --hard <sha1>

# Get remote updates but DONT auto merge it
git fetch github 

# Checkout to your mainline so your branch is correct.
git checkout develop 

# Make a new branch where you'll be applying matches
git checkout -b manual-merge-github-develop

# Apply your patches
git checkout --patch github/develop path/to/file
...

# Merge changes back in
git checkout develop
git merge manual-merge-github-develop # optionally add --no-ff

# You'll probably have to
git push -f # make sure you know what you're doing.

我将这样做

Git format-patch branch_old..branch_new文件

这将为文件生成一个补丁。

在目标branch_old上应用补丁

去吧等等补丁