This happens depending on how the history of the repos has diverged.
Basically when you make a pull you are doing a fetch and a merge in the
background. So there are two types of merges, one of them ends with a
commit merge the other don't.

It's better explained in
https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging

El mié, jul 1, 2015 08:10, Amr Elhosiny <eng.amr2...@gmail.com> escribió:

> Guys,
>
> I have a question about merge commits. Now when I perform git pull from
> somebody. Sometimes I'm getting a merge commit where I should write a merge
> commit message. Sometimes it does not happen, I just hit the git pull and
> it pulls the updates without creating a merge commit.
> What is the difference ? note that the files modified in the new commit
> -when getting a merge commit- are only maintained by a single user.
> And how can I avoid these merge commits as long as the file is maintained
> by one user ?
>
> Thanks,
>
> --
> You received this message because you are subscribed to the Google Groups
> "Git for human beings" group.
> To unsubscribe from this group and stop receiving emails from it, send an
> email to git-users+unsubscr...@googlegroups.com.
> For more options, visit https://groups.google.com/d/optout.
>

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Reply via email to