blocks|key|1753384|text|由于您的pull未成功，因此HEAD+(而不是HEAD%5E)是分支上的最后一个“有效”提交：|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|1753385|git+reset+--hard+HEAD|code-block|syntax|javascript|1753386|您想要的另一部分是让他们的更改覆盖您的更改。|1753387|旧版本的git允许你使用“他们的”合并策略：|1753388|git+pull+--strategy=theirs+remote_branch|1753389|但这已经被移除了，正如this+message+by+Junio+Hamano+(+Git维护者)中所解释的那样。正如在the+link中所指出的，您可以这样做：|1753390|git+fetch+origin
git+reset+--hard+origin|1753391|entityMap|0|LINK|mutability|MUTABLE|url|http://marc.info/?l=git&m=121637513604413&w=2|1^0|4|4|E|4|N|5|0|0|0|0|0|B|S|0|1O|8|1|0|0^^$0|@$1|2|3|4|5|6|7|13|8|@$9|14|A|15|B|C]|$9|16|A|17|B|C]|$9|18|A|19|B|C]]|D|@]|E|$]]|$1|F|3|G|5|H|7|1A|8|@]|D|@]|E|$I|J]]|$1|K|3|L|5|6|7|1B|8|@]|D|@]|E|$]]|$1|M|3|N|5|6|7|1C|8|@]|D|@]|E|$]]|$1|O|3|P|5|H|7|1D|8|@]|D|@]|E|$I|J]]|$1|Q|3|R|5|6|7|1E|8|@]|D|@$9|1F|A|1G|1|1H]|$9|1I|A|1J|1|1K]]|E|$]]|$1|S|3|T|5|H|7|1L|8|@]|D|@]|E|$I|J]]|$1|U|3|-4|5|6|7|1M|8|@]|D|@]|E|$]]]|V|$W|$5|X|Y|Z|E|$10|11]]|12|$5|X|Y|Z|E|$10|11]]]]

Since your <code>pull</code> was unsuccessful then <code>HEAD</code> (not <code>HEAD^</code>) is the last "valid" commit on your branch:

<pre><code>git reset --hard HEAD
</code></pre>

The other piece you want is to let their changes over-ride your changes. 

Older versions of git allowed you to use the "theirs" merge strategy:

<pre><code>git pull --strategy=theirs remote_branch
</code></pre>

But this has since been removed, as explained in <a href="http://marc.info/?l=git&amp;m=121637513604413&amp;w=2" rel="noreferrer">this message by Junio Hamano</a> (the Git maintainer). As noted in <a href="http://marc.info/?l=git&amp;m=121637513604413&amp;w=2" rel="noreferrer">the link</a>, instead you would do this:

<pre><code>git fetch origin
git reset --hard origin
</code></pre>

blocks|key|1538715|text|如果你的git版本是>=+1.6.1，你可以使用git+reset+--merge。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|1538716|另外，正如@Michael+Johnson提到的，如果你的git版本是>=+1.7.4，你也可以使用git+merge+--abort。|1538717|一如既往，在开始合并之前，请确保没有未提交的更改。|1538718|从git+merge+man+page|1538719|当存在MERGE_HEAD时，git+merge+--abort等同于git+reset+--merge。|1538720|当合并正在进行时，会出现MERGE_HEAD。|1538721|此外，关于启动合并时未提交的更改：|1538722|如果您在开始合并之前不想提交更改，只需在合并之前执行git+stash操作，并在完成合并或中止合并后执行git+stash+pop操作。|1538723|entityMap|0|LINK|mutability|MUTABLE|url|https://www.kernel.org/pub/software/scm/git/docs/git-merge.html^0|O|H|0|1E|H|0|0|1|I|0|0|3|A|F|H|Z|H|0|C|A|0|0|Q|9|1G|D|0^^$0|@$1|2|3|4|5|6|7|11|8|@$9|12|A|13|B|C]]|D|@]|E|$]]|$1|F|3|G|5|6|7|14|8|@$9|15|A|16|B|C]]|D|@]|E|$]]|$1|H|3|I|5|6|7|17|8|@]|D|@]|E|$]]|$1|J|3|K|5|6|7|18|8|@]|D|@$9|19|A|1A|1|1B]]|E|$]]|$1|L|3|M|5|6|7|1C|8|@$9|1D|A|1E|B|C]|$9|1F|A|1G|B|C]|$9|1H|A|1I|B|C]]|D|@]|E|$]]|$1|N|3|O|5|6|7|1J|8|@$9|1K|A|1L|B|C]]|D|@]|E|$]]|$1|P|3|Q|5|6|7|1M|8|@]|D|@]|E|$]]|$1|R|3|S|5|6|7|1N|8|@$9|1O|A|1P|B|C]|$9|1Q|A|1R|B|C]]|D|@]|E|$]]|$1|T|3|-4|5|6|7|1S|8|@]|D|@]|E|$]]]|U|$V|$5|W|X|Y|E|$Z|10]]]]

If your git version is >= 1.6.1, you can use <code>git reset --merge</code>.

Also, as @Michael Johnson mentions, if your git version is >= 1.7.4, you can also use <code>git merge --abort</code>.

As always, make sure you have no uncommitted changes before you start a merge.

From the <a href="https://www.kernel.org/pub/software/scm/git/docs/git-merge.html" rel="noreferrer">git merge man page</a>

<code>git merge --abort</code> is equivalent to <code>git reset --merge</code> when <code>MERGE_HEAD</code> is present.

<code>MERGE_HEAD</code> is present when a merge is in progress.

Also, regarding uncommitted changes when starting a merge:

If you have changes you don't want to commit before starting a merge, just <code>git stash</code> them before the merge and <code>git stash pop</code> after finishing the merge or aborting it.

blocks|key|1753292|text|我想你需要的是git+reset。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|1753293|请注意，git+revert的含义与svn+revert非常不同-在Subversion中，revert将丢弃您(未提交的)更改，将文件从存储库返回到当前版本，而git+revert将“撤销”提交。|1753294|git+reset应该执行与svn+revert等效的操作，即丢弃不需要的更改。|1753295|entityMap^0|7|9|0|4|A|I|A|29|A|0|0|9|E|A|0^^$0|@$1|2|3|4|5|6|7|L|8|@$9|M|A|N|B|C]]|D|@]|E|$]]|$1|F|3|G|5|6|7|O|8|@$9|P|A|Q|B|C]|$9|R|A|S|B|C]|$9|T|A|U|B|C]]|D|@]|E|$]]|$1|H|3|I|5|6|7|V|8|@$9|W|A|X|B|C]|$9|Y|A|Z|B|C]]|D|@]|E|$]]|$1|J|3|-4|5|6|7|10|8|@]|D|@]|E|$]]]|K|$]]

I think it's <code>git reset</code> you need.

Beware that <code>git revert</code> means something very different to, say, <code>svn revert</code> - in Subversion the revert will discard your (uncommitted) changes, returning the file to the current version from the repository, whereas <code>git revert</code> "undoes" a commit.

<code>git reset</code> should do the equivalent of <code>svn revert</code>, that is, discard your unwanted changes.

blocks|key|1538629|text|在这个特定的用例中，您并不是真的想中止合并，只是想以一种特定的方式解决冲突。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1538630|也不需要特别重置并使用不同的策略执行合并。git已经正确地突出显示了冲突，并且只有这一个文件需要接受其他方面的更改。|1538631|对于冲突中的未合并文件，git会在索引中提供该文件的公用库、本地和远程版本。(这是读取它们以供git+mergetool在3-way+diff工具中使用的地方。)您可以使用git+show查看它们。|offset|length|style|CODE|1538632|#+common+base:
git+show+:1:_widget.html.erb

#+'ours'
git+show+:2:_widget.html.erb

#+'theirs'
git+show+:3:_widget.html.erb|code-block|syntax|javascript|1538633|解决冲突的最简单方法是逐字使用远程版本：|1538634|git+show+:3:_widget.html.erb+>_widget.html.erb
git+add+_widget.html.erb|1538635|或者，使用git+>=+1.6.1：|1538636|git+checkout+--theirs+_widget.html.erb|1538637|entityMap^0|0|0|1B|D|2E|8|0|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|Y|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|Z|8|@]|9|@]|A|$]]|$1|D|3|E|5|6|7|10|8|@$F|11|G|12|H|I]|$F|13|G|14|H|I]]|9|@]|A|$]]|$1|J|3|K|5|L|7|15|8|@]|9|@]|A|$M|N]]|$1|O|3|P|5|6|7|16|8|@]|9|@]|A|$]]|$1|Q|3|R|5|L|7|17|8|@]|9|@]|A|$M|N]]|$1|S|3|T|5|6|7|18|8|@]|9|@]|A|$]]|$1|U|3|V|5|L|7|19|8|@]|9|@]|A|$M|N]]|$1|W|3|-4|5|6|7|1A|8|@]|9|@]|A|$]]]|X|$]]

In this particular use case, you don't really want to abort the merge, just resolve the conflict in a particular way.

There is no particular need to reset and perform a merge with a different strategy, either. The conflicts have been correctly highlighted by git and the requirement to accept the other sides changes is only for this one file.

For an unmerged file in a conflict git makes available the common base, local and remote versions of the file in the index. (This is where they are read from for use in a 3-way diff tool by <code>git mergetool</code>.) You can use <code>git show</code> to view them.

<pre><code># common base:
git show :1:_widget.html.erb

# 'ours'
git show :2:_widget.html.erb

# 'theirs'
git show :3:_widget.html.erb
</code></pre>

The simplest way to resolve the conflict to use the remote version verbatim is:

<pre><code>git show :3:_widget.html.erb &gt;_widget.html.erb
git add _widget.html.erb
</code></pre>

Or, with git >= 1.6.1:

<pre><code>git checkout --theirs _widget.html.erb
</code></pre>

blocks|key|1538879|text|对于git+>=+1.6.1：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1538880|git+merge+--abort|code-block|syntax|javascript|1538881|对于旧版本的git，这将完成以下工作：|1538882|git+reset+--merge|1538883|或|1538884|git+reset+--hard|1538885|entityMap^0|0|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|Q|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|R|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|S|8|@]|9|@]|A|$]]|$1|I|3|J|5|D|7|T|8|@]|9|@]|A|$E|F]]|$1|K|3|L|5|6|7|U|8|@]|9|@]|A|$]]|$1|M|3|N|5|D|7|V|8|@]|9|@]|A|$E|F]]|$1|O|3|-4|5|6|7|W|8|@]|9|@]|A|$]]]|P|$]]

For git &gt;= 1.6.1:
<pre><code>git merge --abort
</code></pre>
For older versions of git, this will do the job:
<pre><code>git reset --merge
</code></pre>
or
<pre><code>git reset --hard
</code></pre>

blocks|key|1538923|text|您可以中止合并步骤：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1538924|git+merge+--abort|code-block|syntax|javascript|1538925|否则，您可以保留您的更改(在哪个分支上)|1538926|git+checkout+--ours+file1+file2+...|1538927|否则，您可以保留其他分支更改|1538928|git+checkout+--theirs+file1+file2+...|1538929|entityMap^0|0|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|Q|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|R|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|S|8|@]|9|@]|A|$]]|$1|I|3|J|5|D|7|T|8|@]|9|@]|A|$E|F]]|$1|K|3|L|5|6|7|U|8|@]|9|@]|A|$]]|$1|M|3|N|5|D|7|V|8|@]|9|@]|A|$E|F]]|$1|O|3|-4|5|6|7|W|8|@]|9|@]|A|$]]]|P|$]]

You can either abort the merge step:
<pre><code>git merge --abort
</code></pre>
else you can keep your changes (on which branch you are)
<pre><code>git checkout --ours file1 file2 ...
</code></pre>
otherwise you can keep other branch changes
<pre><code>git checkout --theirs file1 file2 ...
</code></pre>

blocks|key|1538779|text|另一种保留工作副本状态的方法是：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1538780|git+stash
git+merge+--abort
git+stash+pop|code-block|syntax|javascript|1538781|我通常不建议这样做，因为它实际上类似于Subversion中的合并，因为它在接下来的提交中丢弃了分支关系。|1538782|entityMap^0|0|0|0^^$0|@$1|2|3|4|5|6|7|K|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|L|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|M|8|@]|9|@]|A|$]]|$1|I|3|-4|5|6|7|N|8|@]|9|@]|A|$]]]|J|$]]

An alternative, which preserves the state of the working copy is:

<pre><code>git stash
git merge --abort
git stash pop
</code></pre>

I generally advise against this, because it is effectively like merging in Subversion as it throws away the branch relationships in the following commit.

blocks|key|1753652|text|从Git+1.6.1.3开始，git+checkout就可以从合并的任意一侧检出：|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|1753653|git+checkout+--theirs+_widget.html.erb|code-block|syntax|javascript|1753654|entityMap|0|LINK|mutability|MUTABLE|url|http://git-scm.com/docs/git-checkout^0|F|C|F|C|0|0|0^^$0|@$1|2|3|4|5|6|7|S|8|@$9|T|A|U|B|C]]|D|@$9|V|A|W|1|X]]|E|$]]|$1|F|3|G|5|H|7|Y|8|@]|D|@]|E|$I|J]]|$1|K|3|-4|5|6|7|Z|8|@]|D|@]|E|$]]]|L|$M|$5|N|O|P|E|$Q|R]]]]

Since Git 1.6.1.3 <a href="http://git-scm.com/docs/git-checkout" rel="noreferrer"><code>git checkout</code></a> has been able to checkout from either side of a merge:

<pre><code>git checkout --theirs _widget.html.erb
</code></pre>

blocks|key|1753832|text|可能不是OP想要的，但对我来说，我尝试将一个稳定分支合并到一个功能分支，但有太多的冲突。我没有设法重置更改，因为头被多次提交更改了，所以最简单的解决方案是强制签出到一个稳定的分支。然后，您可以结帐到另一个分支，它将与合并之前一样。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1753833|git+checkout+-f+master|offset|length|style|CODE|1753834|git+checkout+side-branch|1753835|entityMap^0|0|0|M|0|0|O|0^^$0|@$1|2|3|4|5|6|7|L|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|M|8|@$D|N|E|O|F|G]]|9|@]|A|$]]|$1|H|3|I|5|6|7|P|8|@$D|Q|E|R|F|G]]|9|@]|A|$]]|$1|J|3|-4|5|6|7|S|8|@]|9|@]|A|$]]]|K|$]]

Might not be what the OP wanted, but for me I tried to merge a stable branch to a feature branch and there were too many conflicts.
I didn't manage to reset the changes since the HEAD was changed by many commits, So the easy solution was to force checkout to a stable branch.
you can then checkout to the other branch and it will be as it was before the merge.
<code>git checkout -f master</code>
<code>git checkout side-branch</code>

blocks|key|1538833|text|我发现以下方法对我有效(将单个文件恢复为预合并状态)：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1538834|git+reset+*currentBranchIntoWhichYouMerged*+--+*fileToBeReset*|code-block|syntax|javascript|1538835|entityMap^0|0|0^^$0|@$1|2|3|4|5|6|7|I|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|J|8|@]|9|@]|A|$E|F]]|$1|G|3|-4|5|6|7|K|8|@]|9|@]|A|$]]]|H|$]]

I found the following worked for me (revert a single file to pre-merge state):

<pre><code>git reset *currentBranchIntoWhichYouMerged* -- *fileToBeReset*
</code></pre>

I used <code>git pull</code> and had a merge conflict:

<pre><code>unmerged: _widget.html.erb

You are in the middle of a conflicted merge.
</code></pre>

I know that the other version of the file is good and that mine is bad so all my changes should be abandoned. How can I do this?

I ran into a merge conflict. How can I abort the merge?

我使用了git pull，但出现了合并冲突：unmerged:   _widget.html.erbYou are in the middle of a conflicted merge.我知道文件的另一个版本是好的，而我的是坏的，所以我的所有更改都应该被放弃。我该怎么做呢？

问我遇到了合并冲突。如何中止合并？
EN

回答 10

Stack Overflow用户

Stack Overflow用户

Stack Overflow用户

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问我遇到了合并冲突。如何中止合并？EN

回答 10

Stack Overflow用户

Stack Overflow用户

Stack Overflow用户

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问我遇到了合并冲突。如何中止合并？
EN