On Wed, Jul 01, 2015 at 01:47:15PM +, Nelson Efrain A. Cruz wrote:
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
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
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
