Using SED

https://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging” rel=“noreferrer”>https://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging

This will basically do a fake merge. It will record a new merge commit with both branches as parents, but it will not even look at the branch you’re merging in. It will simply record as the result of the merge the exact code in your current branch.

$ git merge -s ours mundo

我们的策略合并了

$ git diff HEAD HEAD~

You can see that there is no difference between the branch we were on and the result of the merge.

This can often be useful to basically trick Git into thinking that a branch is already merged when doing a merge later on. For example, say you branched off a release branch and have done some work on it that you will want to merge back into your master branch at some point. In the meantime some bugfix on master needs to be backported into your release branch. You can merge the bugfix branch into the release branch and also merge -s ours the same branch into your master branch (even though the fix is already there) so when you later merge the release branch again, there are no conflicts from the bugfix.

A situation I ve found to be useful if I want master to reflect the changes of a new topic branch. I ve noticed that -Xtheirs doesn t merge without conflicts in some circumstances... e.g.

$ git merge -Xtheirs topicFoo 

CONFLICT (modify/delete): js/search.js deleted in HEAD and modified in topicFoo. Version topicFoo of js/search.js left in tree.

在这种情况下,我找到的解决方案是

$ git checkout topicFoo

from topicFoo, first merge in master using the -s ours strategy, this will create the fake commit that is just the state of topicFoo. $ git merge -s ours master

检查创建的合并承诺

$ git log

现在检出母版分支

$ git checkout master

将主题分支重新合并, 但这一时间使用 - X 它们的递归策略, 这将向您提供主分支, 显示主题Foo 的状态 。

$ git merge -X theirs topicFoo

我有一个长长的ext-version 分支,其中删除了在 Develop 上更改的文件,在两个分支的不同地方添加的文件等等。

我想将 ext-version 分支的全部内容都移到 develop 中,所有内容都包含在一次合并中。

上述命令的组合对我有效是:

git merge -X theirs next-version
# lots of files left that were modified on develop but deleted on next-version
git checkout next-version .
# files removed, now add the deletions to the commit
git add .
# still have files that were added on develop; in my case they are all in web/
git rm -r web

不是新的答案,只是将许多答案的比特合并起来,部分是为了保证你可能需要这些答案的<这些>。

接受远程更改 ( theirs ), 如有冲突, 您会收到以下错误 :

fatal: Not possible to fast-forward, aborting.

以便您可以快速地拉动并接受他们的变化:

$ git pull -X theirs --ff

Starting with an example, We have a main branch and a dev branch having some conflicts

退出前先拉动更新, 因此主要分支更新 :

git checkout main
git pull
git checkout dev

然后合并 :

• if you want to accept incoming changes from the main to be the source of truth:

git merge --strategy-option theirs main

• if you want to accept the current changes in dev as the source of truth:

git merge --strategy-option ours main

ours 和 thems 这是特别的单词,它们有意义,不是习惯,但 main 或 dev 可能是您想要合并的其他两个分支。

在使用混合模式的Emacs案中,为了用地雷或地雷解决所有冲突标记,我们可以界定:

(defun aj/smerge-keep-mine-all ()
  ""
  (interactive)
  (save-excursion
    (beginning-of-buffer)
    (while (ignore-errors  user-error (progn (smerge-next) t))
      (smerge-keep-mine))))

(defun aj/smerge-keep-other-all ()
  ""
  (interactive)
  (save-excursion
    (beginning-of-buffer)
    (while (ignore-errors  user-error (progn (smerge-next) t))
      (smerge-keep-other))))

我发现我需要说明 我合并的分支的原产主产地

git merge **origin main** --strategy-option theirs

it s Soluted. 用下面的简单步骤解决所有冲突 。

git fetch && git reset --hard origin/master

git pull -X theirs

git pull origin master