Re:Why is git pull considered harmful? (2013)
by syllogism on Wednesday March 12, 2014 @11:08AM
(#7386001)
Let's say I've got a copy on my server and a copy on my laptop.
I fix a typo in the README on the server, as that's the window I've got in front of me. I push the change, but don't pull it onto my laptop.
I don't pull the change to my laptop. I fix a different typo, and push it.
I pull down the new version on the server. I fix another typo. Now this commit has two parents: the one from the server earlier, and the new one from my laptop. Because it has two parents, it's a merge commit.
Re:Why is git pull considered harmful? (2013)
by mcv on Wednesday March 12, 2014 @11:35AM
(#7386202)
But why is that a problem? If you're merging changes from two different sources, of course the merge is going to have two parents. What else do you expect?
I fix a typo in the README on the server, as that's the window I've got in front of me. I push the change, but don't pull it onto my laptop.
I don't pull the change to my laptop. I fix a different typo, and push it.
I pull down the new version on the server. I fix another typo. Now this commit has two parents: the one from the server earlier, and the new one from my laptop. Because it has two parents, it's a merge commit.