blocks|key|203940|text|好的，在其他两个答案的帮助下，我已经提出了一个直接的解决方案：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|203941|git+checkout+HEAD%5E+file/to/overwrite
git+pull|code-block|syntax|javascript|203942|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|$]]

Alright with the help of the other two answers I've come up with a direct solution:

<pre><code>git checkout HEAD^ file/to/overwrite
git pull
</code></pre>

blocks|key|2833465|text|如果你想从你的工作副本中删除所有本地更改--包括git未跟踪的文件--只需将它们隐藏起来：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|2833466|git+stash+push+--include-untracked|code-block|syntax|javascript|2833467|如果您不再需要它们，您现在可以删除该存储：|2833468|git+stash+drop|2833469|如果你不想隐藏你已经准备好的更改--例如使用git+add+--那么添加选项--keep-index。但是，请注意，如果这些阶段性更改与来自上游的更改发生冲突，这仍然会阻止合并。|offset|length|style|CODE|2833470|2833471|如果只想覆盖本地更改的特定部分，有两种可能：|2833472|2833473|提交您不想覆盖的所有内容，并对其余内容使用上面的方法。|ordered-list-item|2833474|对您希望覆盖的更改使用git+checkout+path/to/file/to/revert。确保该文件不是通过git+reset+HEAD+path/to/file/to/revert.|2833475|转移的|2833476|entityMap^0|0|0|0|0|M|7|12|C|0|0|0|0|0|B|Z|1K|11|0|0^^$0|@$1|2|3|4|5|6|7|13|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|14|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|15|8|@]|9|@]|A|$]]|$1|I|3|J|5|D|7|16|8|@]|9|@]|A|$E|F]]|$1|K|3|L|5|6|7|17|8|@$M|18|N|19|O|P]|$M|1A|N|1B|O|P]]|9|@]|A|$]]|$1|Q|3|-4|5|6|7|1C|8|@]|9|@]|A|$]]|$1|R|3|S|5|6|7|1D|8|@]|9|@]|A|$]]|$1|T|3|-4|5|6|7|1E|8|@]|9|@]|A|$]]|$1|U|3|V|5|W|7|1F|8|@]|9|@]|A|$]]|$1|X|3|Y|5|W|7|1G|8|@$M|1H|N|1I|O|P]|$M|1J|N|1K|O|P]]|9|@]|A|$]]|$1|Z|3|10|5|6|7|1L|8|@]|9|@]|A|$]]|$1|11|3|-4|5|6|7|1M|8|@]|9|@]|A|$]]]|12|$]]

If you want remove all local changes - including files that are untracked by git - from your working copy, simply stash them:

<pre><code>git stash push --include-untracked
</code></pre>

If you don't need them anymore, you now can drop that stash:

<pre><code>git stash drop
</code></pre>

If you don't want to stash changes that you already staged - e.g. with <code>git add</code> - then add the option <code>--keep-index</code>. Note however, that this will still prevent merging if those staged changes collide with the ones from upstream.

<hr>

If you want to overwrite only specific parts of your local changes, there are two possibilities:

<ol>
<li>Commit everything you don't want to overwrite and use the method above for the rest.</li>
<li>Use <code>git checkout path/to/file/to/revert</code> for the changes you wish to overwrite. Make sure that file is not staged via <code>git reset HEAD path/to/file/to/revert</code>.</li>
</ol>

blocks|key|2833653|text|这对我来说可以覆盖所有本地更改，并且不需要身份：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|2833654|git+reset+--hard
git+pull|code-block|syntax|javascript|2833655|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|$]]

This works for me to override all local changes and does not require an identity:

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

blocks|key|2833518|text|这里有一个可以丢弃阶段性更改的解决方案：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|2833519|git+reset+file/to/overwrite
git+checkout+file/to/overwrite|code-block|syntax|javascript|2833520|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|$]]

Here is a solution that throws away staged changes:

<pre><code>git reset file/to/overwrite
git checkout file/to/overwrite
</code></pre>

blocks|key|199705|text|这里有太多的答案，所以我不想再多加一个，但上面所有的答案都比它们需要的更笨拙。我必须一直这样做，因为Git似乎变得困惑，并说我修改了没有改变的文件(不能恢复，因为它们没有改变，但我不能拉取，因为它们应该已经改变了)到目前为止，我发现最简单和最快的是：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|199706|git+stash
git+stash+drop
git+pull|code-block|syntax|javascript|199707|通知：本地更改将丢失|offset|length|style|BOLD|199708|entityMap^0|0|0|0|2|3|2|0^^$0|@$1|2|3|4|5|6|7|O|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|P|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|Q|8|@$I|R|J|S|K|L]|$I|T|J|U|K|L]]|9|@]|A|$]]|$1|M|3|-4|5|6|7|V|8|@]|9|@]|A|$]]]|N|$]]

So many answers here that I hate to add yet another, but all of the above are clunkier than they need to be. I have to do this all the time as Git seems to become confused and says I have modified files that have not changed (can't revert because they didn't change, but I can't pull because they supposedly have changed) Simplest and fastest I've found so far is:
<pre><code>git stash
git stash drop
git pull
</code></pre>
NOTICE: local changes will be lost

blocks|key|202253|text|您可以在进行合并之前提交更改，也可以将它们隐藏起来：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|202254|202255|git+stash+save|ordered-list-item|offset|length|style|CODE|202256|git+merge+origin/master|202257|git+stash+pop|202258|202259|entityMap^0|0|0|0|E|0|0|N|0|0|D|0|0^^$0|@$1|2|3|4|5|6|7|Q|8|@]|9|@]|A|$]]|$1|B|3|-4|5|6|7|R|8|@]|9|@]|A|$]]|$1|C|3|D|5|E|7|S|8|@$F|T|G|U|H|I]]|9|@]|A|$]]|$1|J|3|K|5|E|7|V|8|@$F|W|G|X|H|I]]|9|@]|A|$]]|$1|L|3|M|5|E|7|Y|8|@$F|Z|G|10|H|I]]|9|@]|A|$]]|$1|N|3|-4|5|6|7|11|8|@]|9|@]|A|$]]|$1|O|3|-4|5|6|7|12|8|@]|9|@]|A|$]]]|P|$]]

You can either commit your changes before you do the merge, or you stash them:

<ol>
<li><code>git stash save</code></li>
<li><code>git merge origin/master</code></li>
<li><code>git stash pop</code></li>
</ol>

blocks|key|3046314|text|如果要放弃对某个文件所做的本地更改，可以执行以下操作：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|3046315|git+checkout+--+<file>|code-block|syntax|javascript|3046316|然后，您可以使用最新版本覆盖这些文件，只需执行以下操作：|3046317|git+pull|3046318|entityMap^0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|M|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|N|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|O|8|@]|9|@]|A|$]]|$1|I|3|J|5|D|7|P|8|@]|9|@]|A|$E|F]]|$1|K|3|-4|5|6|7|Q|8|@]|9|@]|A|$]]]|L|$]]

If you want to discard your local changes on one file you can do the following:

<pre><code>git checkout -- &lt;file&gt;
</code></pre>

Then you could overwrite the file[s] with the latest version just doing:

<pre><code>git pull
</code></pre>

blocks|key|3046235|text|如果您的存储库包含一些从master中删除的文件|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|3046236|3046237|git+checkout+master|ordered-list-item|3046238|git+fetch+origin|3046239|git+reset+--hard+origin/master|3046240|git+checkout+-b+newbranch|3046241|3046242|entityMap^0|C|6|0|0|0|J|0|0|G|0|0|U|0|0|P|0|0^^$0|@$1|2|3|4|5|6|7|S|8|@$9|T|A|U|B|C]]|D|@]|E|$]]|$1|F|3|-4|5|6|7|V|8|@]|D|@]|E|$]]|$1|G|3|H|5|I|7|W|8|@$9|X|A|Y|B|C]]|D|@]|E|$]]|$1|J|3|K|5|I|7|Z|8|@$9|10|A|11|B|C]]|D|@]|E|$]]|$1|L|3|M|5|I|7|12|8|@$9|13|A|14|B|C]]|D|@]|E|$]]|$1|N|3|O|5|I|7|15|8|@$9|16|A|17|B|C]]|D|@]|E|$]]|$1|P|3|-4|5|6|7|18|8|@]|D|@]|E|$]]|$1|Q|3|-4|5|6|7|19|8|@]|D|@]|E|$]]]|R|$]]

If your repository contains a few files which are removed from <code>master</code>:

<ol>
<li><code>git checkout master</code></li>
<li><code>git fetch origin</code></li>
<li><code>git reset --hard origin/master</code></li>
<li><code>git checkout -b newbranch</code></li>
</ol>

blocks|key|2834465|text|git+pull+--rebase+--autostash|type|code-block|depth|inlineStyleRanges|entityRanges|data|syntax|javascript|2834466|unstyled|2834467|+-r，--rebase=false%7Ctrue%7Cmerges%7Cpreserve%7Cinteractive如果为true，则在获取后将当前分支重新设置为上游分支的基础。如果存在与上游--autostash、--no-autostash相对应的远程跟踪分支，则在启动rebase之前，根据需要隐藏本地修改，并在完成后应用stash条目|blockquote|2834468|2834469|2834470|2834471|我不知道为什么这个问题还没有得到回答，但正如您所看到的，解决方案很简单。这里的所有答案都建议相同:删除/保存本地更改并应用于上游，然后(如果您使用save)将本地更改应用于顶部。|offset|length|style|CODE|2834472|git+pull+--rebase+--autostash一步一步做什么：|2834473|1.+your+local+changes+saved+by+`--autostash`
2.+your+local+commits+saved+by+`--rebase`
3.+commits+from+upstream+applied+to+your+branch
4.+your+local+commits+are+restored+on+top+of+upstream
5.+your+local+changes+are+restored+to+working+directory|2834474|我的情况(可能也是你的情况)：|2834475|我有本地更改(在工作目录中的更改)：|2834476|​|2834477|📷|atomic|2834478|2834479|当我尝试拉取远程更改时，我得到错误：|2834480|2834481|2834482|2834483|此更改不会与本地更改相交：|2834484|2834485|2834486|2834487|因此，当我没有任何问题地保存和应用本地更改时，automatically+pull+--rebase+--autostash|BOLD|2834488|2834489|2834490|2834491|现在，我的本地更改稍微低了一点：|2834492|2834493|2834494|entityMap|0|IMAGE|mutability|IMMUTABLE|imageUrl|https://ask.qcloudimg.com/http-save/yehe-900000/7ded25d39406e34d821447b6261f2036.jpeg|imageAlt|1|https://ask.qcloudimg.com/http-save/yehe-900000/282481fdbbc0999d4cd923e6de3cd701.jpeg|2|https://ask.qcloudimg.com/http-save/yehe-900000/e9a0374a44d194ba7477cca0e787712e.jpeg|3|https://ask.qcloudimg.com/http-save/yehe-900000/2e7f9e86f09dc8f8bbbbc63f0bbe1b30.jpeg|4|https://ask.qcloudimg.com/http-save/yehe-900000/c3430034ed8fbf39e452556eed06963a.jpeg^0|0|0|0|0|0|0|21|4|0|0|T|0|0|0|0|0|0|1|0|0|0|0|0|0|1|1|0|0|0|0|0|1|2|0|0|N|D|11|P|0|0|0|1|3|0|0|0|0|1|4|0|0^^$0|@$1|2|3|4|5|6|7|26|8|@]|9|@]|A|$B|C]]|$1|D|3|-4|5|E|7|27|8|@]|9|@]|A|$]]|$1|F|3|G|5|H|7|28|8|@]|9|@]|A|$]]|$1|I|3|-4|5|E|7|29|8|@]|9|@]|A|$]]|$1|J|3|-4|5|E|7|2A|8|@]|9|@]|A|$]]|$1|K|3|-4|5|E|7|2B|8|@]|9|@]|A|$]]|$1|L|3|M|5|E|7|2C|8|@$N|2D|O|2E|P|Q]]|9|@]|A|$]]|$1|R|3|S|5|E|7|2F|8|@$N|2G|O|2H|P|Q]]|9|@]|A|$]]|$1|T|3|U|5|6|7|2I|8|@]|9|@]|A|$B|C]]|$1|V|3|W|5|E|7|2J|8|@]|9|@]|A|$]]|$1|X|3|Y|5|E|7|2K|8|@]|9|@]|A|$]]|$1|Z|3|10|5|E|7|2L|8|@]|9|@]|A|$]]|$1|11|3|12|5|13|7|2M|8|@]|9|@$N|2N|O|2O|1|2P]]|A|$]]|$1|14|3|10|5|E|7|2Q|8|@]|9|@]|A|$]]|$1|15|3|16|5|E|7|2R|8|@]|9|@]|A|$]]|$1|17|3|10|5|E|7|2S|8|@]|9|@]|A|$]]|$1|18|3|12|5|13|7|2T|8|@]|9|@$N|2U|O|2V|1|2W]]|A|$]]|$1|19|3|10|5|E|7|2X|8|@]|9|@]|A|$]]|$1|1A|3|1B|5|E|7|2Y|8|@]|9|@]|A|$]]|$1|1C|3|10|5|E|7|2Z|8|@]|9|@]|A|$]]|$1|1D|3|12|5|13|7|30|8|@]|9|@$N|31|O|32|1|33]]|A|$]]|$1|1E|3|10|5|E|7|34|8|@]|9|@]|A|$]]|$1|1F|3|1G|5|E|7|35|8|@$N|36|O|37|P|1H]|$N|38|O|39|P|Q]]|9|@]|A|$]]|$1|1I|3|10|5|E|7|3A|8|@]|9|@]|A|$]]|$1|1J|3|12|5|13|7|3B|8|@]|9|@$N|3C|O|3D|1|3E]]|A|$]]|$1|1K|3|10|5|E|7|3F|8|@]|9|@]|A|$]]|$1|1L|3|1M|5|E|7|3G|8|@]|9|@]|A|$]]|$1|1N|3|12|5|13|7|3H|8|@]|9|@$N|3I|O|3J|1|3K]]|A|$]]|$1|1O|3|10|5|E|7|3L|8|@]|9|@]|A|$]]|$1|1P|3|-4|5|E|7|3M|8|@]|9|@]|A|$]]]|1Q|$1R|$5|1S|1T|1U|A|$1V|1W|1X|-4]]|1Y|$5|1S|1T|1U|A|$1V|1Z|1X|-4]]|20|$5|1S|1T|1U|A|$1V|21|1X|-4]]|22|$5|1S|1T|1U|A|$1V|23|1X|-4]]|24|$5|1S|1T|1U|A|$1V|25|1X|-4]]]]

<pre><code>git pull --rebase --autostash
</code></pre>
<blockquote>
<pre><code> -r, --rebase[=false|true|merges|preserve|interactive]
 When true, rebase the current branch on top of the 
 upstream branch after fetching. If there is a 
 remote-tracking branch corresponding to the upstream
</code></pre>
</blockquote>
<blockquote>
<pre><code> --autostash, --no-autostash
 Before starting rebase, stash local modifications away if
 needed, and apply the stash entry when done
</code></pre>
</blockquote>
<hr />
I do not know why this is not answered yet, but solution, as you can see is simple. All answers here suggest same: to delete/save your local changes and apply upstream, then (if you <code>save</code>) apply your local changes on top.
What <code>git pull --rebase --autostash</code> does step-by-step:
<pre><code>1. your local changes saved by `--autostash`
2. your local commits saved by `--rebase`
3. commits from upstream applied to your branch
4. your local commits are restored on top of upstream
5. your local changes are restored to working directory
</code></pre>
My case (probably yours too):
I have local changes (changes at working directory):
<a href="https://i.stack.imgur.com/EO6CF.jpg" rel="noreferrer"><img src="https://i.stack.imgur.com/EO6CF.jpg" alt="enter image description here" /></a>
When I try to pull remote changes I get error:
<a href="https://i.stack.imgur.com/KWldG.jpg" rel="noreferrer"><img src="https://i.stack.imgur.com/KWldG.jpg" alt="enter image description here" /></a>
This changes do not intersect with local changes:
<a href="https://i.stack.imgur.com/dxEai.jpg" rel="noreferrer"><img src="https://i.stack.imgur.com/dxEai.jpg" alt="enter image description here" /></a>
So when I <code>pull --rebase --autostash</code> local changes saved and applied without any problem automatically
<a href="https://i.stack.imgur.com/vX1XC.jpg" rel="noreferrer"><img src="https://i.stack.imgur.com/vX1XC.jpg" alt="enter image description here" /></a>
Now my local changes are little lower:
<a href="https://i.stack.imgur.com/Csxqj.jpg" rel="noreferrer"><img src="https://i.stack.imgur.com/Csxqj.jpg" alt="enter image description here" /></a>

blocks|key|3046324|text|有时，这些都不起作用。令人恼火的是，由于LF的事情，我认为，工作的是删除文件，然后拉。并不是说我推荐这个解决方案，但是如果这个文件不存在，git将不会无用地通知您更改(甚至可能不是更改)将被覆盖，并允许您继续。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|3046325|使用风险自负。|3046326|entityMap^0|0|0^^$0|@$1|2|3|4|5|6|7|F|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|G|8|@]|9|@]|A|$]]|$1|D|3|-4|5|6|7|H|8|@]|9|@]|A|$]]]|E|$]]

Sometimes, none of these work. Annoyingly, due to the LF thing I think, what will work is deleting the files, then pulling. Not that I recommend this solution, but if the file doesn't exist, git won't uselessly inform you that your changes (which may not even be changes) will get overridden, and will let you continue.

Use at your own risk.

blocks|key|204212|text|git+stash+save+--keep-index对我不起作用。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|204213|下面的命令按预期工作。|204214|git+reset+--hard
git+pull|code-block|syntax|javascript|204215|如果您不需要本地更改，则它会覆盖所有本地更改。|BOLD|204216|entityMap^0|0|R|0|0|0|C|B|0^^$0|@$1|2|3|4|5|6|7|R|8|@$9|S|A|T|B|C]]|D|@]|E|$]]|$1|F|3|G|5|6|7|U|8|@]|D|@]|E|$]]|$1|H|3|I|5|J|7|V|8|@]|D|@]|E|$K|L]]|$1|M|3|N|5|6|7|W|8|@$9|X|A|Y|B|O]]|D|@]|E|$]]|$1|P|3|-4|5|6|7|Z|8|@]|D|@]|E|$]]]|Q|$]]

<code>git stash save --keep-index</code> did not worked for me.

below command worked as expected. 

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

It override all local changes if you don't need them.

blocks|key|199356|text|在最近的Git中，你可以在pull上添加-r/--rebase命令，在抓取之后将当前分支重新建立在上游分支之上。警告应该会消失，但有可能会出现一些需要解决的冲突。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|199357|199358|或者，您可以强制签出不同的分支，然后再次返回master，例如：|199359|git+checkout+origin/master+-f
git+checkout+master+-f|code-block|syntax|javascript|199360|然后像往常一样再拉一次：|199361|git+pull+origin+master|199362|使用这种方法可以节省时间，避免存储(git+stash)和潜在的权限问题，重置文件(git+reset+HEAD+--hard)，删除文件(git+clean+-fd)等。此外，上面的更容易记住。|199363|entityMap^0|D|4|K|2|N|8|0|0|M|6|0|0|0|0|I|9|16|L|1Y|D|0^^$0|@$1|2|3|4|5|6|7|V|8|@$9|W|A|X|B|C]|$9|Y|A|Z|B|C]|$9|10|A|11|B|C]]|D|@]|E|$]]|$1|F|3|-4|5|6|7|12|8|@]|D|@]|E|$]]|$1|G|3|H|5|6|7|13|8|@$9|14|A|15|B|C]]|D|@]|E|$]]|$1|I|3|J|5|K|7|16|8|@]|D|@]|E|$L|M]]|$1|N|3|O|5|6|7|17|8|@]|D|@]|E|$]]|$1|P|3|Q|5|K|7|18|8|@]|D|@]|E|$L|M]]|$1|R|3|S|5|6|7|19|8|@$9|1A|A|1B|B|C]|$9|1C|A|1D|B|C]|$9|1E|A|1F|B|C]]|D|@]|E|$]]|$1|T|3|-4|5|6|7|1G|8|@]|D|@]|E|$]]]|U|$]]

In the recent Git, you can add <code>-r</code>/<code>--rebase</code> on <code>pull</code> command to rebase your current branch on top of the upstream branch after fetching. The warning should disappear, but there is a risk that you'll get some conflicts which you'll need to solve.

<hr>

Alternatively you can checkout different branch with force, then go back to <code>master</code> again, e.g.:

<pre><code>git checkout origin/master -f
git checkout master -f
</code></pre>

Then pull it again as usual:

<pre><code>git pull origin master
</code></pre>

Using this method can save you time from stashing (<code>git stash</code>) and potential permission issues, reseting files (<code>git reset HEAD --hard</code>), removing files (<code>git clean -fd</code>), etc. Also the above it's easier to remember.

blocks|key|204173|text|这个问题是因为您在本地对文件进行了更改，并且相同的文件与Git存储库中的更改存在，因此在拉/推之前，您需要存储本地更改：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|204174|要覆盖单个文件的本地更改，请执行以下操作：|204175|git+reset+file/to/overwrite
git+checkout+file/to/overwrite|code-block|syntax|javascript|204176|要覆盖所有本地更改(所有文件中的更改)：|204177|git+stash
git+pull
git+stash+pop|204178|此外，这个问题可能是因为您所在的分支没有与主分支合并。|204179|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|6|7|R|8|@]|9|@]|A|$]]|$1|D|3|E|5|F|7|S|8|@]|9|@]|A|$G|H]]|$1|I|3|J|5|6|7|T|8|@]|9|@]|A|$]]|$1|K|3|L|5|F|7|U|8|@]|9|@]|A|$G|H]]|$1|M|3|N|5|6|7|V|8|@]|9|@]|A|$]]|$1|O|3|-4|5|6|7|W|8|@]|9|@]|A|$]]]|P|$]]

This problem is because you have made changes locally to file/s and the same file/s exists with changes in the Git repository, so before pull/push you will need stash local changes:

To overwrite local changes of a single file:

<pre><code>git reset file/to/overwrite
git checkout file/to/overwrite
</code></pre>

To overwrite all the local changes (changes in all files):

<pre><code>git stash
git pull
git stash pop
</code></pre>

Also this problem may be because of you are on a branch which is not merged with the master branch.

blocks|key|202526|text|git+reset+--hard+&&+git+clean+-df|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|202527|警告：这将重置并删除任何未跟踪的文件。|BOLD|202528|entityMap^0|0|X|0|0|2|0^^$0|@$1|2|3|4|5|6|7|K|8|@$9|L|A|M|B|C]]|D|@]|E|$]]|$1|F|3|G|5|6|7|N|8|@$9|O|A|P|B|H]]|D|@]|E|$]]|$1|I|3|-4|5|6|7|Q|8|@]|D|@]|E|$]]]|J|$]]

<code>git reset --hard &amp;&amp; git clean -df</code>

Caution: This will reset and delete any untracked files.

blocks|key|202682|text|尝尝这个|type|unstyled|depth|inlineStyleRanges|entityRanges|data|202683|git+fetch+--all+

git+reset+--hard+origin/master

git+pull+origin+master|code-block|syntax|javascript|202684|对我来说，用力拉是一项工作|202685|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|$]]

Try this
<pre><code>git fetch --all 

git reset --hard origin/master

git pull origin master
</code></pre>
It's work for me to force pull

blocks|key|201718|text|这使我放弃了实时远程服务器上的更改，并从源代码控制GitHub中提取：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|201719|git+reset+--hard
git+pull+origin+master|code-block|syntax|javascript|201720|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|$]]

This worked for me to discard changes on the live remote server and pull from the source control GitHub:

<pre><code>git reset --hard
git pull origin master
</code></pre>

blocks|key|199483|text|以下是我解决这个问题的策略。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|199484|问题陈述|offset|length|style|BOLD|199485|我们需要在10个以上的文件中进行更改。我们尝试过PULL+(git+pull+origin+master)，但是Git大喊：|CODE|199486|199487|错误:合并将覆盖对以下文件所做的本地更改:请在合并之前提交更改或隐藏更改。|blockquote|199488|199489|199490|我们试图先执行commit，然后再执行pull，但它们都不起作用。|199491|解决方案|199492|我们实际上处于脏阶段，因为文件位于“临时区域”，也称为“索引区”，而一些文件位于“头部区域”，也称为“本地Git目录”。我们想从服务器上拉出更改。|199493|以清晰的方式查看此链接，了解有关不同阶段的信息：|199494|我们遵循了以下步骤|199495|199496|git+stash+(这使得我们的工作目录变得干净。您的更改由Git).|unordered-list-item|199497|git+pull+origin+master存储在堆栈上(从server)|199498|git+stash+apply中拉出更改(从stack)|199499|git+commit+-m+'message'应用所有更改))(提交changes)|199500|git+push+origin+master+(将更改推送到server)|199501|git+stash+drop+(丢弃堆栈)|199502|199503|让我们来了解一下您何时以及为什么需要存储|199504|如果您处于脏状态，意味着您正在对文件进行更改，然后由于任何原因，您被迫拉出或切换到另一个分支，以执行一些非常紧急的工作，因此在这一点上，您不能拉或切换，直到您提交您的更改。这里提供了stash命令作为帮助。|199505|摘自ProGIT一书，第二版：|199506|199507|通常，当您一直在处理项目的一部分时，事情处于混乱状态，您想要切换一下分支来处理其他事情。问题是，您不想提交完成了一半的工作，这样您就可以稍后回到这一点。这个问题的答案是git+stash命令。存储采用工作目录的脏状态-即已修改的跟踪文件和暂存的更改-并将其保存在可随时重新应用的未完成更改堆栈中。|199508|199509|entityMap^0|0|0|4|0|O|T|0|0|0|0|0|7|6|J|4|0|0|4|0|0|0|0|0|0|9|0|0|M|0|0|F|0|0|N|0|0|M|0|0|E|0|0|0|K|0|2J|5|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|1R|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|1S|8|@$D|1T|E|1U|F|G]]|9|@]|A|$]]|$1|H|3|I|5|6|7|1V|8|@$D|1W|E|1X|F|J]]|9|@]|A|$]]|$1|K|3|-4|5|6|7|1Y|8|@]|9|@]|A|$]]|$1|L|3|M|5|N|7|1Z|8|@]|9|@]|A|$]]|$1|O|3|-4|5|6|7|20|8|@]|9|@]|A|$]]|$1|P|3|-4|5|6|7|21|8|@]|9|@]|A|$]]|$1|Q|3|R|5|6|7|22|8|@$D|23|E|24|F|J]|$D|25|E|26|F|J]]|9|@]|A|$]]|$1|S|3|T|5|6|7|27|8|@$D|28|E|29|F|G]]|9|@]|A|$]]|$1|U|3|V|5|6|7|2A|8|@]|9|@]|A|$]]|$1|W|3|X|5|6|7|2B|8|@]|9|@]|A|$]]|$1|Y|3|Z|5|6|7|2C|8|@]|9|@]|A|$]]|$1|10|3|-4|5|6|7|2D|8|@]|9|@]|A|$]]|$1|11|3|12|5|13|7|2E|8|@$D|2F|E|2G|F|J]]|9|@]|A|$]]|$1|14|3|15|5|13|7|2H|8|@$D|2I|E|2J|F|J]]|9|@]|A|$]]|$1|16|3|17|5|13|7|2K|8|@$D|2L|E|2M|F|J]]|9|@]|A|$]]|$1|18|3|19|5|13|7|2N|8|@$D|2O|E|2P|F|J]]|9|@]|A|$]]|$1|1A|3|1B|5|13|7|2Q|8|@$D|2R|E|2S|F|J]]|9|@]|A|$]]|$1|1C|3|1D|5|13|7|2T|8|@$D|2U|E|2V|F|J]]|9|@]|A|$]]|$1|1E|3|-4|5|6|7|2W|8|@]|9|@]|A|$]]|$1|1F|3|1G|5|6|7|2X|8|@$D|2Y|E|2Z|F|G]]|9|@]|A|$]]|$1|1H|3|1I|5|6|7|30|8|@$D|31|E|32|F|J]]|9|@]|A|$]]|$1|1J|3|1K|5|6|7|33|8|@]|9|@]|A|$]]|$1|1L|3|-4|5|6|7|34|8|@]|9|@]|A|$]]|$1|1M|3|1N|5|N|7|35|8|@]|9|@]|A|$]]|$1|1O|3|-4|5|6|7|36|8|@]|9|@]|A|$]]|$1|1P|3|-4|5|6|7|37|8|@]|9|@]|A|$]]]|1Q|$]]

Here is my strategy to solve the problem.

Problem Statement

We need to make changes in more than 10 files. We tried <code>PULL (git pull origin master)</code>, but Git shouted:

<blockquote>
 error: Your local changes to the following files would be overwritten
 by merge: Please, commit your changes or stash them before you can
 merge.
</blockquote>

We tried to execute <code>commit</code> and then <code>pull</code>, but they didn't work either.

Solution

We were in the dirty stage actually, because the files were in the "Staging Area" a.k.a "Index Area" and some were in the "Head Area" a.k.a "local Git directory". And we wanted to pull the changes from the server.

Check this link for information about different stages of Git in a clear manner: <a href="http://rogerdudler.github.io/git-guide/" rel="noreferrer">GIT Stages</a>

We followed the following steps

<ul>
<li><code>git stash</code> (this made our working directory clean. Your changes are stored on the stack by Git).</li>
<li><code>git pull origin master</code> (Pull the changes from the server)</li>
<li><code>git stash apply</code> (Applied all the changes from stack)</li>
<li><code>git commit -m 'message'</code> (Committed the changes)</li>
<li><code>git push origin master</code> (Pushed the changes to the server)</li>
<li><code>git stash drop</code> (Drop the stack)</li>
</ul>

Let's understand when and why you need stashing

If you are in the dirty state, means you are making changes in your files and then you are compelled, due to any reason, to pull or switch to another branch for some very urgent work, so at this point you can't pull or switch until you commit your change. The <code>stash</code> command is here as a helping hand.

From the book ProGIT, 2nd Edition:

<blockquote>
 Often, when you’ve been working on part of your project, things are in
 a messy state and you want to switch branches for a bit to work on
 something else. The problem is, you don’t want to do a commit of
 half-done work just so you can get back to this point later. The
 answer to this issue is the git stash command. Stashing takes the
 dirty state of your working directory – that is, your modified tracked
 files and staged changes – and saves it on a stack of unfinished
 changes that you can reapply at any time.
</blockquote>

blocks|key|203998|text|你可以用它来覆盖文件|type|unstyled|depth|inlineStyleRanges|entityRanges|data|203999|git+checkout+file_to_overwrite|code-block|syntax|javascript|204000|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|$]]

You can use this for overwrite file

<pre><code>git checkout file_to_overwrite
</code></pre>

blocks|key|199454|text|解决这个问题的最好方法是：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|199455|git+checkout+--+<path/file_name>|code-block|syntax|javascript|199456|之后，您可以通过以下方式覆盖该文件：|199457|git+pull+origin+master|199458|entityMap^0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|M|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|N|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|O|8|@]|9|@]|A|$]]|$1|I|3|J|5|D|7|P|8|@]|9|@]|A|$E|F]]|$1|K|3|-4|5|6|7|Q|8|@]|9|@]|A|$]]]|L|$]]

The best way to solve this problem is:

<pre><code>git checkout -- &lt;path/file_name&gt;
</code></pre>

After that you can overwrite the file by:

<pre><code>git pull origin master
</code></pre>

blocks|key|203931|text|如果您想要覆盖特定的更改，您需要一些方法来告诉它您想要忘记哪些更改。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|203932|您可以尝试使用git+stash+--patch有选择地隐藏您想要放弃的更改，然后使用git+stash+drop删除该存储。然后，您可以引入远程更改，并像往常一样合并它们。|offset|length|style|CODE|203933|entityMap^0|0|7|H|17|E|0^^$0|@$1|2|3|4|5|6|7|J|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|K|8|@$D|L|E|M|F|G]|$D|N|E|O|F|G]]|9|@]|A|$]]|$1|H|3|-4|5|6|7|P|8|@]|9|@]|A|$]]]|I|$]]

If you want to overwrite specific changes, you need some way of telling it which ones you want to forget.

You could try selectively stashing the changes you want to abandon using <code>git stash --patch</code> and then dropping that stash with <code>git stash drop</code>. You can then pull in the remote changes and merge them as normal.

blocks|key|2833943|text|如果您想在服务器上保留生产更改，只需合并到新的配置项中即可。处理方法如下：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|2833944|git+stash
git+pull
git+stash+pop|code-block|syntax|javascript|2833945|也许你不会执行所有的操作。您可以知道下一步可以做什么。|2833946|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|$]]

If you want to keep production changes on the server, just merge into a new configuration item. The processing method is as follows:

<pre><code>git stash
git pull
git stash pop
</code></pre>

Maybe you don't execute all operations. You can know what you can do next.

blocks|key|204248|text|最简单的解决方案是：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|204249|git+reset+--hard+&&+git+pull|code-block|syntax|javascript|204250|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|$]]

The simplest solution is:

<pre><code>git reset --hard &amp;&amp; git pull
</code></pre>

blocks|key|2834330|text|出现错误“您对以下文件的本地更改将被合并覆盖”是因为您在本地存储库中有一些尚未提交的更改，因此在从远程存储库提取之前，只需提交本地存储库中的更改即可。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|2834331|假设您的远程repo有一些分支xyz，并且您希望将该远程repo+xyz分支合并(复制到)本地repo+xyz分支，|2834332|{
git+checkout+xyz++++++++++++++++++//check+out+to+the+respective+branch+in+local+repo
git+commit+-m+"commiting+message"+//commit+changes+if+any,+in+local+repo+branch+xyz
git+pull++++++++++++++++++++++++++//it+pulls+remote+xyz+branch+into+local+xyz+branch
}|code-block|syntax|javascript|2834333|entityMap^0|0|0|0^^$0|@$1|2|3|4|5|6|7|K|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|L|8|@]|9|@]|A|$]]|$1|D|3|E|5|F|7|M|8|@]|9|@]|A|$G|H]]|$1|I|3|-4|5|6|7|N|8|@]|9|@]|A|$]]]|J|$]]

Error "Your local changes to the following files would be overwritten by merge" comes because you have some changes in the local repo that have NOT been commited yet, so before pulling from remote repo just commit the changes in local repo.

Lets say your remote repo has some branch xyz
and you want that remote repo xyz branch to be merged into (copied to) local repo xyz branch then,

<pre><code>{
git checkout xyz //check out to the respective branch in local repo
git commit -m "commiting message" //commit changes if any, in local repo branch xyz
git pull //it pulls remote xyz branch into local xyz branch
}
</code></pre>

blocks|key|202687|text|对我来说，起作用了：-|type|unstyled|depth|inlineStyleRanges|offset|length|style|BOLD|entityRanges|data|202688|首先，我清除了所有未跟踪的文件，运行->+git+clean+-f.|CODE|202689|git+pull|unordered-list-item|202690|202691|entityMap^0|5|6|0|L|C|0|0|8|0|0^^$0|@$1|2|3|4|5|6|7|O|8|@$9|P|A|Q|B|C]]|D|@]|E|$]]|$1|F|3|G|5|6|7|R|8|@$9|S|A|T|B|H]]|D|@]|E|$]]|$1|I|3|J|5|K|7|U|8|@$9|V|A|W|B|H]]|D|@]|E|$]]|$1|L|3|-4|5|6|7|X|8|@]|D|@]|E|$]]|$1|M|3|-4|5|6|7|Y|8|@]|D|@]|E|$]]]|N|$]]

For me this worked:-
<ol>
<li>First I cleaned all the untracked files, run-&gt; <code>git clean -f</code>.</li>
<li><code>git pull</code></li>
</ol>

blocks|key|202345|text|我有一个这样的特殊情况:我有一个文件，上面有--假定--没有改变。很难找到它，因为git+status命令没有显示任何更改|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|202346|entityMap^0|15|A|0^^$0|@$1|2|3|4|5|6|7|H|8|@$9|I|A|J|B|C]]|D|@]|E|$]]|$1|F|3|-4|5|6|7|K|8|@]|D|@]|E|$]]]|G|$]]

I had a special case of this: I had a file with --assume-unchanged on it. It was hard to locate, as the <code>git status</code> command was not showing any changes

blocks|key|204069|text|我忽略了我的存储库中的一个文件，当我执行git+pull+upstream+master时，我得到了以下错误：|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|204070|204071|错误:对以下文件所做的本地更改将被合并覆盖:+myfile.js合并前，请提交更改或隐藏更改。正在中止|blockquote|204072|204073|204074|为了解决这个问题，我做了以下工作|204075|git+update-index+--no-assume-unchanged+myfile.js|code-block|syntax|javascript|204076|然后我做了git+status，得到了这条消息|204077|在分支主机上的|204078|你的分支比‘源/主机’落后4次提交，并且可以快进。(使用"git+pull“更新您的本地分支)|204079|204080|未暂存提交的更改：(使用"git+add+...“更新要提交的内容)(使用"git+checkout+--+...“放弃工作目录中的更改)|204081|已修改:+myfile.js|204082|没有向提交添加任何更改(使用"git+add“和/或"git+commit+-a")|204083|204084|然后我做了git+checkout+myfile.js，然后是git+pull+upstream+master。这一次git提取操作成功了。|204085|entityMap^0|K|O|0|0|0|0|0|0|0|5|A|0|0|0|0|0|0|0|0|5|M|V|O|0^^$0|@$1|2|3|4|5|6|7|1A|8|@$9|1B|A|1C|B|C]]|D|@]|E|$]]|$1|F|3|-4|5|6|7|1D|8|@]|D|@]|E|$]]|$1|G|3|H|5|I|7|1E|8|@]|D|@]|E|$]]|$1|J|3|-4|5|6|7|1F|8|@]|D|@]|E|$]]|$1|K|3|-4|5|6|7|1G|8|@]|D|@]|E|$]]|$1|L|3|M|5|6|7|1H|8|@]|D|@]|E|$]]|$1|N|3|O|5|P|7|1I|8|@]|D|@]|E|$Q|R]]|$1|S|3|T|5|6|7|1J|8|@$9|1K|A|1L|B|C]]|D|@]|E|$]]|$1|U|3|V|5|6|7|1M|8|@]|D|@]|E|$]]|$1|W|3|X|5|I|7|1N|8|@]|D|@]|E|$]]|$1|Y|3|-4|5|6|7|1O|8|@]|D|@]|E|$]]|$1|Z|3|10|5|6|7|1P|8|@]|D|@]|E|$]]|$1|11|3|12|5|6|7|1Q|8|@]|D|@]|E|$]]|$1|13|3|14|5|6|7|1R|8|@]|D|@]|E|$]]|$1|15|3|-4|5|6|7|1S|8|@]|D|@]|E|$]]|$1|16|3|17|5|6|7|1T|8|@$9|1U|A|1V|B|C]|$9|1W|A|1X|B|C]]|D|@]|E|$]]|$1|18|3|-4|5|6|7|1Y|8|@]|D|@]|E|$]]]|19|$]]

I was ignoring a file in my repo and when I did <code>git pull upstream master</code> I got the following error:

<blockquote>
 error: Your local changes to the following files would be overwritten by merge:
 myfile.js
 Please, commit your changes or stash them before you can merge.
 Aborting
</blockquote>

To resolve it I did the following

<pre><code>git update-index --no-assume-unchanged myfile.js
</code></pre>

I then did <code>git status</code> and got this message

<blockquote>
 On branch master Your branch is behind 'origin/master' by 4 commits,
 and can be fast-forwarded. (use "git pull" to update your local
 branch)
 
 Changes not staged for commit: (use "git add ..." to update
 what will be committed) (use "git checkout -- ..." to discard
 changes in working directory)
 
 modified: myfile.js
 
 no changes added to commit (use "git add" and/or "git commit -a")
</blockquote>

Then I did <code>git checkout myfile.js</code> followed by <code>git pull upstream master</code>. This time the git pull operation was successful.

blocks|key|199541|text|我在从主机上拉的时候遇到了这个问题。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|199542|我处理它的方式，使用Visual+Studio；|199543|199544|首先，我对我的解决方案执行了Undo+commit。|ordered-list-item|199545|然后我执行了Git拉取过程。|199546|199547|希望这能有所帮助！|199548|entityMap^0|0|0|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|O|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|P|8|@]|9|@]|A|$]]|$1|D|3|-4|5|6|7|Q|8|@]|9|@]|A|$]]|$1|E|3|F|5|G|7|R|8|@]|9|@]|A|$]]|$1|H|3|I|5|G|7|S|8|@]|9|@]|A|$]]|$1|J|3|-4|5|6|7|T|8|@]|9|@]|A|$]]|$1|K|3|L|5|6|7|U|8|@]|9|@]|A|$]]|$1|M|3|-4|5|6|7|V|8|@]|9|@]|A|$]]]|N|$]]

I encountered this when pulling from the master.

The way I handled it, using Visual Studio;

<ol>
<li>First, I performed Undo commit on my solution.</li>
<li>Then I did the Git pull process.</li>
</ol>

Hope this helps!

blocks|key|201998|text|我已经尝试成功了，在拉之前，让提交所有你还没有提交文件，那么你将不会收到来自AS的消息。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|201999|entityMap^0|0^^$0|@$1|2|3|4|5|6|7|D|8|@]|9|@]|A|$]]|$1|B|3|-4|5|6|7|E|8|@]|9|@]|A|$]]]|C|$]]

I have tried and it successfully, before pulling, let commit all file that you have not committed, then you will not receive that messages from AS.

blocks|key|202040|text|我是git的新手，不确定我的解决方案是不是一个好主意。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|202041|我已经测试了所有的答案，但没有一个对我有效！|202042|但我找到了另一个解决方案：|202043|1.+Backup+both+of+local+and+repository+versions+of+the+file.
2.+Delete+the+file+from+repository.
3.+git+add+.
4.+git+commit
5.+git+push|code-block|syntax|javascript|202044|希望这能有所帮助。|202045|entityMap^0|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|O|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|P|8|@]|9|@]|A|$]]|$1|D|3|E|5|6|7|Q|8|@]|9|@]|A|$]]|$1|F|3|G|5|H|7|R|8|@]|9|@]|A|$I|J]]|$1|K|3|L|5|6|7|S|8|@]|9|@]|A|$]]|$1|M|3|-4|5|6|7|T|8|@]|9|@]|A|$]]]|N|$]]

I'm new in git and not sure if my solution is a good idea.

I've tested ALL of answers and none of them worked for me!

But I found another solution:

<pre><code>1. Backup both of local and repository versions of the file.
2. Delete the file from repository.
3. git add .
4. git commit
5. git push
</code></pre>

Hope this helps.

blocks|key|202168|text|由于您的分支比‘branch+/dev’落后xx次提交，因此可以快进。尝试执行以下命令：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|202169|git+checkout+.
git+pullenter+code+here|code-block|syntax|javascript|202170|希望这能解决你的问题。|202171|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|$]]

Due to your branch is behind 'origin/dev' by xx commits, and can be fast-forwarded. Try this command:
<pre><code>git checkout .
git pullenter code here
</code></pre>
Hope that fix your issue.

blocks|key|204148|text|如果此错误是由行尾引起的，|type|unstyled|depth|inlineStyleRanges|entityRanges|data|204149|git+add
git+checkout+mybranch|code-block|syntax|javascript|204150|都会起作用的。我真的不太确定它为什么会起作用。|204151|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|$]]

If this error is because of line endings,

<pre><code>git add
git checkout mybranch
</code></pre>

will work. I'm not really sure why it works.

blocks|key|202467|text|对于Pycharm，您可以执行Git-->Revert，然后pull。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|202468|entityMap^0|0^^$0|@$1|2|3|4|5|6|7|D|8|@]|9|@]|A|$]]|$1|B|3|-4|5|6|7|E|8|@]|9|@]|A|$]]]|C|$]]

For Pycharm, you can do Git-->Revert and then pull.

blocks|key|199588|text|如果使用git-lfs并且文件指针被实际文件覆盖，也会出现此消息。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|199589|然后使用：|199590|git+stash
git+lfs+migrate+import
git+pull|code-block|syntax|javascript|199591|我的案例的完整输出|199592|λ+git+stash
Saved+working+directory+and+index+state+WIP+on+master:+5d4ad47+Merge+branch+'feature/...'+into+'master'
Encountered+1+file(s)+that+should+have+been+pointers,+but+weren't:
++++++++public/apple-touch-icon.png

λ+git+pull
Updating+5a4ad44..b25f79d
error:+Your+local+changes+to+the+following+files+would+be+overwritten+by+merge:
++++++++public/apple-touch-icon.png
Please+commit+your+changes+or+stash+them+before+you+merge.
Aborting

λ+git+lfs+migrate+import
migrate:+Fetching+remote+refs:+...,+done
migrate:+Sorting+commits:+...,+done
migrate:+Rewriting+commits:+100%25+(0/0),+done
migrate:+Updating+refs:+...,+done
migrate:+checkout:+...,+done


λ+git+pull
Updating+5d4ad47..a25c79a
Fast-forward
+public/apple-touch-icon.png+%7C+Bin+2092+->+130+bytes
+public/favicon.ico++++++++++%7C+Bin+6518+->+1150+bytes
+2+files+changed,+0+insertions(%2B),+0+deletions(-)|199593|请参阅https://github.com/git-lfs/git-lfs/issues/2839|199594|entityMap|0|LINK|mutability|MUTABLE|url|https://github.com/git-lfs/git-lfs/issues/2839^0|4|7|0|0|0|0|0|3|1A|0|0^^$0|@$1|2|3|4|5|6|7|10|8|@$9|11|A|12|B|C]]|D|@]|E|$]]|$1|F|3|G|5|6|7|13|8|@]|D|@]|E|$]]|$1|H|3|I|5|J|7|14|8|@]|D|@]|E|$K|L]]|$1|M|3|N|5|6|7|15|8|@]|D|@]|E|$]]|$1|O|3|P|5|J|7|16|8|@]|D|@]|E|$K|L]]|$1|Q|3|R|5|6|7|17|8|@]|D|@$9|18|A|19|1|1A]]|E|$]]|$1|S|3|-4|5|6|7|1B|8|@]|D|@]|E|$]]]|T|$U|$5|V|W|X|E|$Y|Z]]]]

This message can also happen if <code>git-lfs</code> is used and a file pointer was overwritten by a real file.

then you use:

<pre><code>git stash
git lfs migrate import
git pull
</code></pre>

full output from my case

<pre><code>λ git stash
Saved working directory and index state WIP on master: 5d4ad47 Merge branch 'feature/...' into 'master'
Encountered 1 file(s) that should have been pointers, but weren't:
 public/apple-touch-icon.png

λ git pull
Updating 5a4ad44..b25f79d
error: Your local changes to the following files would be overwritten by merge:
 public/apple-touch-icon.png
Please commit your changes or stash them before you merge.
Aborting

λ git lfs migrate import
migrate: Fetching remote refs: ..., done
migrate: Sorting commits: ..., done
migrate: Rewriting commits: 100% (0/0), done
migrate: Updating refs: ..., done
migrate: checkout: ..., done


λ git pull
Updating 5d4ad47..a25c79a
Fast-forward
 public/apple-touch-icon.png | Bin 2092 -&gt; 130 bytes
 public/favicon.ico | Bin 6518 -&gt; 1150 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
</code></pre>

see <a href="https://github.com/git-lfs/git-lfs/issues/2839" rel="nofollow noreferrer">https://github.com/git-lfs/git-lfs/issues/2839</a>

blocks|key|2834249|text|我得到了同样的错误--消息执行了|type|unstyled|depth|inlineStyleRanges|entityRanges|data|2834250|：插件从vim编辑器命令行更新命令|offset|length|style|BOLD|2834251|2834252|“请在合并前提交或隐藏更改”|blockquote|2834253|2834254|2834255|1.刚刚将包含插件的文件夹从|2834256|rm+-rf+~/.vim/bundle/plugin-folder/|code-block|syntax|javascript|2834257|2.并从vim命令行重新安装它，|2834258|:PluginInstall!|2834259|因为我的~/.vimrc包含了构建到该目的地的插件的指令：|2834260|​|2834261|📷|atomic|2834262|2834263|这创建了适当的文件夹，|2834264|并将新包放到文件夹~./.vim/bundle/reinstalled-plugins-folder中|2834265|"!“标志(由于PluginUpdate命令不成功)已更改|2834266|添加到"%2B“符号，然后使用PluginUpdate命令。|2834267|entityMap|0|IMAGE|mutability|IMMUTABLE|imageUrl|https://ask.qcloudimg.com/http-save/yehe-900000/7d17d58d1a3ace7d1c6606ba12bd2cb7.png|imageAlt^0|0|0|F|0|0|0|0|0|0|2|0|0|0|2|0|0|F|0|0|0|0|1|0|0|0|0|O|Q|0|1|1|0|4|1|D|C|0^^$0|@$1|2|3|4|5|6|7|1N|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|1O|8|@$D|1P|E|1Q|F|G]]|9|@]|A|$]]|$1|H|3|-4|5|6|7|1R|8|@]|9|@]|A|$]]|$1|I|3|J|5|K|7|1S|8|@]|9|@]|A|$]]|$1|L|3|-4|5|6|7|1T|8|@]|9|@]|A|$]]|$1|M|3|-4|5|6|7|1U|8|@]|9|@]|A|$]]|$1|N|3|O|5|6|7|1V|8|@$D|1W|E|1X|F|G]]|9|@]|A|$]]|$1|P|3|Q|5|R|7|1Y|8|@]|9|@]|A|$S|T]]|$1|U|3|V|5|6|7|1Z|8|@$D|20|E|21|F|G]]|9|@]|A|$]]|$1|W|3|X|5|6|7|22|8|@$D|23|E|24|F|G]]|9|@]|A|$]]|$1|Y|3|Z|5|6|7|25|8|@]|9|@]|A|$]]|$1|10|3|11|5|6|7|26|8|@]|9|@]|A|$]]|$1|12|3|13|5|14|7|27|8|@]|9|@$D|28|E|29|1|2A]]|A|$]]|$1|15|3|11|5|6|7|2B|8|@]|9|@]|A|$]]|$1|16|3|17|5|6|7|2C|8|@]|9|@]|A|$]]|$1|18|3|19|5|6|7|2D|8|@$D|2E|E|2F|F|G]]|9|@]|A|$]]|$1|1A|3|1B|5|6|7|2G|8|@$D|2H|E|2I|F|G]]|9|@]|A|$]]|$1|1C|3|1D|5|6|7|2J|8|@$D|2K|E|2L|F|G]|$D|2M|E|2N|F|G]]|9|@]|A|$]]|$1|1E|3|-4|5|6|7|2O|8|@]|9|@]|A|$]]]|1F|$1G|$5|1H|1I|1J|A|$1K|1L|1M|-4]]]]

I got the same error-message executed the :PluginUpdate command from the vim editors command-line

<blockquote>
 "Please commit your changes or stash them before you merge"
</blockquote>

1. just physically removed the folder contained the plugins form the

<pre><code>rm -rf ~/.vim/bundle/plugin-folder/
</code></pre>

2. and reinstalled it form the vim commandline, :PluginInstall! because my ~/.vimrc contained the instructions to build the plugin to that destination:

<a href="https://i.stack.imgur.com/70b5j.png" rel="nofollow noreferrer"><img src="https://i.stack.imgur.com/70b5j.png" alt="enter image description here"></a>

this created the proper folder, and got new package into that folder ~./.vim/bundle/reinstalled-plugins-folder 
The "!" signs (due to the unsuccessful PluginUpdate command)
were changed to "+" signs, and after that worked the PluginUpdate command to.

blocks|key|3047008|text|我的解决方案是从集成开发环境外部对将要被覆盖的文件执行delete，然后是pull。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|3047009|(您始终可以备份和手动合并未跟踪的数据)|3047010|entityMap^0|R|6|11|4|0|0^^$0|@$1|2|3|4|5|6|7|J|8|@$9|K|A|L|B|C]|$9|M|A|N|B|C]]|D|@]|E|$]]|$1|F|3|G|5|6|7|O|8|@]|D|@]|E|$]]|$1|H|3|-4|5|6|7|P|8|@]|D|@]|E|$]]]|I|$]]

My solution was <code>delete</code> the files from outside the IDE that are going to be overwritten, then <code>pull</code>. 

(you can always backup and manually merge untracked data)

blocks|key|2834525|text|检查您可以覆盖并丢失本地更改的文件，然后|type|unstyled|depth|inlineStyleRanges|entityRanges|data|2834526|git+checkout+--ours+${filePath}
git+merge+upstream/master|code-block|syntax|javascript|2834527|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|$]]

Check the file which you are okay to overwrite and lose local changes and then
<pre><code>git checkout --ours ${filePath}
git merge upstream/master
</code></pre>

blocks|key|202128|text|只需提交本地更改并合并提交-a|type|unstyled|depth|inlineStyleRanges|entityRanges|data|202129|entityMap^0|0^^$0|@$1|2|3|4|5|6|7|D|8|@]|9|@]|A|$]]|$1|B|3|-4|5|6|7|E|8|@]|9|@]|A|$]]]|C|$]]

Simply commit the local changes and merge
commit -a

How do I ignore the following error message on Git pull?

<blockquote>
 Your local changes to the following files would be overwritten by merge
</blockquote>

What if I want to overwrite them?

I've tried things like <code>git pull -f</code>, but nothing works.

To be clear, I only want to overwrite specific changes, not everything.

How do I ignore an error on 'git pull' about my local changes would be overwritten by merge?

如何在Git拉取时忽略以下错误消息？对以下文件所做的本地更改将被合并覆盖如果我想让覆盖它们怎么办？我尝试过像git pull -f这样的东西，但都不起作用。需要说明的是，我只想覆盖特定的更改，而不是全部。

问如何忽略关于我的本地更改将被merge覆盖的'git pull‘错误？
EN

回答 37

Stack Overflow用户

Stack Overflow用户

Stack Overflow用户

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问如何忽略关于我的本地更改将被merge覆盖的'git pull‘错误？EN

回答 37

Stack Overflow用户

Stack Overflow用户

Stack Overflow用户

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问如何忽略关于我的本地更改将被merge覆盖的'git pull‘错误？
EN