Re: Stupid git!

[Dmitry Gutov <dgutov@yandex.ru>]

On 09/14/2015 06:11 AM, Stephen J. Turnbull wrote:

> @Dmitry: Weren't you here for the last "git is a screw" thread?  Yes,
> he's seen this before.  He doesn't understand it yet.

It was Richard's thread, and it was quite a while ago. Plenty of time to 
learn and play around.

>   > The merge commit shouldn't, generally, include any non-mergy changes, so
>   > you're not expected to stage any of the files you've been working on,
>   > before committing.
>
> @Dmitry: I have no idea what you mean by this, especially not in the
> context of helping someone who probably thinks[3] of a merge as
> equivalent to

I have a feeling that a person that did 'git add xyz' before 'git pull' 
might try to make xyz a part of the ensuing merge commit. They shouldn't 
do that.

> There should be a file in .git/ named "MERGE_MSG" or something like
> that with a preformatted message you can use with the -F option.

'git commit' will pre-fill it for you automatically.