News for hackers. Stuff that matters.
Re:Mercurial: Onward and upward by worklogin on Thursday April 30, 2015 @05:11PM (#9467670)
Nothing about that deals with collaboration.

fetch/merge/pull/remotes can be pretty confusing without really wrapping your head around it.

Re:Mercurial: Onward and upward by Touche on Thursday April 30, 2015 @05:31PM (#9467799)
What is wtf about git pull?

> git pull origin master

(fix conflicts)

> git commit

That's it.

Re:Mercurial: Onward and upward by dfabulich on Thursday April 30, 2015 @06:48PM (#9468135)
1) Pull creates a merge commit. Why?

2) What's a fast forward?

3) What's a tracking branch?

Re:Mercurial: Onward and upward by somebehemoth on Thursday April 30, 2015 @07:28PM (#9468250)
1) So you can revert the merge very easily. 2) Merging without a commit. 3) A branch on a remote server that you have a copy of locally and you want to keep track of the status of remote against the local copy (who's behind and who is ahead?).

This is my basic understanding in terms of how I use git. I like Mercurial too and don't have a horse in this race.

Re:Mercurial: Onward and upward by mpdehaan2 on Thursday April 30, 2015 @08:26PM (#9468567)
While this somewhat underscores some complexity in git, here's something I wrote trying to explain to others why and how to avoid those merge commits:

http://michaeldehaan.net/post/116465000577/understanding-whe...

Re:Mercurial: Onward and upward by Touche on Thursday April 30, 2015 @09:34PM (#9468847)
You don't need to know any of these things to get along fine.