Here are the most relevant sections from the documentation mentioned here yesterday:
http://book.git-scm.com/3_basic_branching_and_merging.html http://book.git-scm.com/3_distributed_workflows.html All the Best, Matt Chapman Ninjitsu Web Development -- The contents of this message should be assumed to be Confidential, and may not be disclosed without permission of the sender. On Thu, Apr 29, 2010 at 2:34 PM, Domenic Santangelo <[email protected]> wrote: > With d.o moving to git, I'm becoming more interested in how it works. Can > anyone point me to a really solid primer? I've looked around at length and am > having a tough time grokking how git works, especially in regards to > multi-person development. > > For example, I have one project that the previous dev set up to use git. For > just me that's fine -- git add, git commit -a, git push, then reset to head > on the dev server. But when more than one person is involved all hell breaks > loose: > > Say you and I edit the same .css file and for some reason there's a conflict > (git seems very bad at merging .css compared to svn from my experience). In > svn: svn ci, see you're out of date, svn up, resolve the conflict, svn > resolved, svn ci, done. In git this is all confusing and you can even break > MERGE_HEAD if you try to git pull after resolving a conflict and git will > think you still have conflicts to resolve. It's all very troublesome. > > From what I can tell, this is a common confusion coming from a > "commit-update"-style system like svn; regardless, I still don't really get > it. Any tips/articles/anything? > > Thanks, > -D
