blocks|key|121327|text|git+pull基本上是一次两个动作：git+fetch后跟一个git+merge+(除非您使用git+pull+--rebase，在这种情况下您可以猜到会发生什么)。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|121328|之所以会出现这种情况，是因为Git不能像大多数时候那样进行快进合并。这样做的原因通常是因为您已经在本地git+committed到您试图拉入的分支，现在您需要将远程更改与本地更改合并。|BOLD|121329|同样值得注意的是，Git已经为您预先填充了合并消息，因此您实际上不需要键入任何内容。只需保存并退出，合并就应该完成。(当然，除非存在合并冲突)。|121330|entityMap^0|0|8|J|9|W|9|1C|H|0|T|2|1F|A|0|0^^$0|@$1|2|3|4|5|6|7|M|8|@$9|N|A|O|B|C]|$9|P|A|Q|B|C]|$9|R|A|S|B|C]|$9|T|A|U|B|C]]|D|@]|E|$]]|$1|F|3|G|5|6|7|V|8|@$9|W|A|X|B|H]|$9|Y|A|Z|B|C]]|D|@]|E|$]]|$1|I|3|J|5|6|7|10|8|@]|D|@]|E|$]]|$1|K|3|-4|5|6|7|11|8|@]|D|@]|E|$]]]|L|$]]

<code>git pull</code> is basically two actions at once: <code>git fetch</code> followed by a <code>git merge</code> (unless you use <code>git pull --rebase</code>, in which case you can guess what happens).

The reason you're seeing this is because Git can't do a fast-forward merge, like it can most of the time. The reason for that is usually because you've <code>git commit</code>ted locally to the branch you're trying to pull, and now you need to merge the remote changes with your local ones.

It's also worth noting that Git pre-populated the merge message for you, so you don't really need to type anything. Just save and exit, and the merge should be complete. (Unless, of course, there are merge conflicts).

blocks|key|2887792|text|如果您正在尝试将master合并到mybranchSample分支，那么这是非常正常的。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|2887793|Git将master合并到mybranchSample+(当您从git+pull+origin+master分支执行mybranchSample时)，并为您commits合并更改(除非有任何冲突)，并向您提供预先填充的消息。您可以只保存并退出。|2887794|但如果你只是想从远程master分支获得最新的代码，以便与本地master分支合并，那么你应该签出到master，然后从master中拉出。|BOLD|2887795|来自你的声明|2887796|2887797|它将主文件合并到我的文件中。尽管我还没有处理过master中的一些文件，但当我输入git+status时，它会以绿色显示文件列表。|blockquote|2887798|2887799|2887800|我认为你正在尝试做第二个。|2887801|所以，试一试：|2887802|git+checkout+master
git+pull+origin+master|code-block|syntax|javascript|2887803|entityMap^0|8|6|H|E|0|4|6|D|E|W|M|1M|E|26|7|0|0|1|A|6|V|6|1E|6|1O|6|0|0|0|0|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|13|8|@$9|14|A|15|B|C]|$9|16|A|17|B|C]]|D|@]|E|$]]|$1|F|3|G|5|6|7|18|8|@$9|19|A|1A|B|C]|$9|1B|A|1C|B|C]|$9|1D|A|1E|B|C]|$9|1F|A|1G|B|C]|$9|1H|A|1I|B|C]]|D|@]|E|$]]|$1|H|3|I|5|6|7|1J|8|@$9|1K|A|1L|B|J]|$9|1M|A|1N|B|C]|$9|1O|A|1P|B|C]|$9|1Q|A|1R|B|C]|$9|1S|A|1T|B|C]]|D|@]|E|$]]|$1|K|3|L|5|6|7|1U|8|@]|D|@]|E|$]]|$1|M|3|-4|5|6|7|1V|8|@]|D|@]|E|$]]|$1|N|3|O|5|P|7|1W|8|@]|D|@]|E|$]]|$1|Q|3|-4|5|6|7|1X|8|@]|D|@]|E|$]]|$1|R|3|-4|5|6|7|1Y|8|@]|D|@]|E|$]]|$1|S|3|T|5|6|7|1Z|8|@]|D|@]|E|$]]|$1|U|3|V|5|6|7|20|8|@]|D|@]|E|$]]|$1|W|3|X|5|Y|7|21|8|@]|D|@]|E|$Z|10]]|$1|11|3|-4|5|6|7|22|8|@]|D|@]|E|$]]]|12|$]]

If you were trying to merge <code>master</code> to <code>mybranchSample</code> branch, then this is perfectly normal. 

Git merges <code>master</code> to <code>mybranchSample</code> (when you did <code>git pull origin master</code> from <code>mybranchSample</code> branch) and <code>commits</code> the merge changes for you (unless there is any conflict) and gives you the pre-populated message. You can just save and exit. 

BUT If you were just trying to get the latest code from the remote <code>master</code> branch to merge with local <code>master</code> branch, then you should checkout out to <code>master</code> and then pull from <code>master</code>.

from you statement

<blockquote>
 it merges master files into my files. And even though I havent worked on some files from master, it shows the files list in Green when I type git status.
</blockquote>

I think you are trying to do the second one.

so, try:

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

blocks|key|120702|text|Linus+Torvalds对此解释得最好：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|120703|120704|散布关于即将到来的'git‘UI改变的消息，因为我在很大程度上是罪魁祸首。|blockquote|120705|120706|这一变化有望让人们编写合并消息来解释他们的合并，甚至可能在不必要的时候决定根本不合并。|120707|在过去的几周里，我一直在使用这个git特性，它导致了我从submainter中合并了不同的注释(好吧，至少如果submainter给了我一些)。所以我试着以身作则。|120708|但是如果你不喜欢解释你的合并，这可能会很烦人。当然，如果你不解释你的合并，你是令人讨厌的，所以最终一切都是平衡的。“业力平衡”，可以这么说。|120709|120710|来源：https://plus.google.com/%2BLinusTorvalds/posts/SrePhcj6XJe|offset|length|120711|entityMap|0|LINK|mutability|MUTABLE|url|https://plus.google.com/%2BLinusTorvalds/posts/SrePhcj6XJe^0|0|0|0|0|0|0|0|0|3|1K|0|0^^$0|@$1|2|3|4|5|6|7|Z|8|@]|9|@]|A|$]]|$1|B|3|-4|5|6|7|10|8|@]|9|@]|A|$]]|$1|C|3|D|5|E|7|11|8|@]|9|@]|A|$]]|$1|F|3|-4|5|6|7|12|8|@]|9|@]|A|$]]|$1|G|3|H|5|6|7|13|8|@]|9|@]|A|$]]|$1|I|3|J|5|6|7|14|8|@]|9|@]|A|$]]|$1|K|3|L|5|6|7|15|8|@]|9|@]|A|$]]|$1|M|3|-4|5|6|7|16|8|@]|9|@]|A|$]]|$1|N|3|O|5|6|7|17|8|@]|9|@$P|18|Q|19|1|1A]]|A|$]]|$1|R|3|-4|5|6|7|1B|8|@]|9|@]|A|$]]]|S|$T|$5|U|V|W|A|$X|Y]]]]

Linus Torvalds explains it best:

<blockquote>
 Spreading the word about an upcoming 'git' UI change, since I'm
 largely to blame.
 
 This change hopefully makes people write merge messages to explain
 their merges, and maybe even decide not to merge at all when it's not
 necessary.
 
 I've been using that git feature for the last few weeks now, and it
 has resulted in my merges from submaintainers having various notes in
 them (well, at least if the submainter gave me any). So I'm trying to
 lead by example.
 
 But if you don't like explaining your merges, this might be annoying.
 Of course, if you don't explain your merges, you are annoying, so it
 all evens out in the end. "Karmic balance", so to say.
</blockquote>

Source: <a href="https://plus.google.com/+LinusTorvalds/posts/SrePhcj6XJe">https://plus.google.com/+LinusTorvalds/posts/SrePhcj6XJe</a>

blocks|key|2887932|text|这种情况只发生在您身上的原因并不是您的配置不同，而是您要合并的分支不同。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|2887933|diff中您没有更改的文件的原因是，在合并之后，新的提交必须是提交的父对象:您上次执行的提交和master上的最新提交。新的提交包含所有更改/文件。因此，如果您从新的到上次提交的不同，您将看到所有更改/添加的文件，这些文件是在您的分支与主分支不同步时在主分支上更改/添加的。|2887934|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|$]]

The reason this is only happening to you is not that your config is different, but that the branch you're merging in is different. 

The reason for the files in the diff that you did not change is that after a merge, the new commit has to parent commits: The commit you did last and the newest commit on master. The new commit contains all changes/files. So if you diff from new to your last commit you will see all the files as changed/added that were changed/added on master while your branch was out of sync with the master branch.

blocks|key|2676575|text|我觉得你对分支机构有意见...我可以想象你面临的两种可能的情况：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|2676576|1)您有一个远程分支mybranchSample，并且您想要处理它-您目前与主分支没有任何关系(也就是说，您不希望将您的分支合并为主分支，反之亦然)。你在你的问题中说|offset|length|style|CODE|2676577|当我在fetch+like之后从中提取我的分支时...|BOLD|2676578|2676579|但是您要做的是git+pull+origin+master，它从主中提取。相反，使用git版本>=+1.6.6，您应该能够使用以下命令签出远程分支|2676580|git+fetch
git+checkout+mybranchSample|code-block|syntax|javascript|2676581|2676582|2)你尝试在mybranchSample上工作，但是想要从主分支那里得到最新的代码。那么，正如Anand+S所说，合并可能是必要的。|2676583|entityMap^0|0|A|E|0|G|7|0|0|7|M|W|1|0|0|0|6|E|0^^$0|@$1|2|3|4|5|6|7|X|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|Y|8|@$D|Z|E|10|F|G]]|9|@]|A|$]]|$1|H|3|I|5|6|7|11|8|@$D|12|E|13|F|J]]|9|@]|A|$]]|$1|K|3|-4|5|6|7|14|8|@]|9|@]|A|$]]|$1|L|3|M|5|6|7|15|8|@$D|16|E|17|F|G]|$D|18|E|19|F|J]]|9|@]|A|$]]|$1|N|3|O|5|P|7|1A|8|@]|9|@]|A|$Q|R]]|$1|S|3|-4|5|6|7|1B|8|@]|9|@]|A|$]]|$1|T|3|U|5|6|7|1C|8|@$D|1D|E|1E|F|G]]|9|@]|A|$]]|$1|V|3|-4|5|6|7|1F|8|@]|9|@]|A|$]]]|W|$]]

I think you have an issue with the branches... The 2 possible scenarios I could imagine you're facing:

1)
You have a remote branch, <code>mybranchSample</code>, and you wanna work on it - you have nothing to do at the moment with the master branch (that is, you don't wanna merge your branch into master or vice versa). You say in your question 

<blockquote>
 When I take pull from my branch after fetch like ...
</blockquote>

But what you do is <code>git pull origin master</code>, which pulls from master. Instead, you should be able, with git version >= 1.6.6, to checkout your remote branch using

<pre><code>git fetch
git checkout mybranchSample
</code></pre>

<hr>

2) You try to work on <code>mybranchSample</code> but wanna have the latest code from the master branch there. Then it makes sense that a merge might be necessary, as Anand S said.

blocks|key|120728|text|只是想给每个人一个简单的答案，如果我错了，请纠正我：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|120729|当您在分支上提交后执行git+pull时，似乎会发生这种情况。您的本地更改不存在于远程上，因此它会提交以同步所有内容。|offset|length|style|CODE|120730|entityMap^0|0|B|8|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]]|9|@]|A|$]]|$1|H|3|-4|5|6|7|N|8|@]|9|@]|A|$]]]|I|$]]

Just to try to give everyone a simple answer, and please correct me if I am not correct:

This seems to happen when you <code>git pull</code> after committing on the branch. Your local changes don't exist on the remote so it makes a commit to get everything synced.

I pull from my branch:

<pre><code>git checkout mybranchSample
git fetch
git pull origin master
</code></pre>

Then, Git gives me the following message:

<blockquote>
 Please enter a commit message to explain why this merge is necessary, 
 especially if it merges an updated upstream into a topic branch
</blockquote>

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

And after entering a commit message, it merges <code>master</code> into my files. And even though I haven't worked on some files from <code>master</code>, it shows the files list in green when I type <code>git status</code>.

This issue is not happening with my colleagues, but me only.
What can be the reason behind this?

Git pull asks me to write merge message

我从中提取我的分支git checkout mybranchSamplegit fetchgit pull origin master然后，Git给了我以下消息：请输入提交消息以解释为什么需要此合并，特别是当它将更新的上游合并到主题分支中时​​在输入提交消息后，它会将master合并到我的文件中。尽管我还没有处理过ma...

问Git pull要求我写入合并邮件
EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问Git pull要求我写入合并邮件EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问Git pull要求我写入合并邮件
EN