To add to the resources:<div><br></div><div>Git Screencasts (not updated anymore, but useful) - <a href="http://www.gitcasts.com/">http://www.gitcasts.com</a></div><div><a href="http://www.gitcasts.com/"></a>Git Ready - <a href="http://www.gitready.com/">http://www.gitready.com/</a></div>
<div><br></div><div><a href="http://www.gitready.com/"></a>Cheers<br clear="all">----------------------------------<br>Dipen Chaudhary<br>Founder, QED42 : We build beautiful and scalable web strategies ( <a href="http://www.qed42.com">www.qed42.com</a> )<br>
Blog: <a href="http://dipenchaudhary.com">dipenchaudhary.com</a><br>Twitter: <a href="http://twitter.com/dipench">http://twitter.com/dipench</a><br><br>
<br><br><div class="gmail_quote">On Fri, Apr 30, 2010 at 3:12 AM, Matt Chapman <span dir="ltr"><<a href="mailto:matt@ninjitsuweb.com">matt@ninjitsuweb.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">
Here are the most relevant sections from the documentation mentioned<br>
here yesterday:<br>
<br>
<a href="http://book.git-scm.com/3_basic_branching_and_merging.html" target="_blank">http://book.git-scm.com/3_basic_branching_and_merging.html</a><br>
<a href="http://book.git-scm.com/3_distributed_workflows.html" target="_blank">http://book.git-scm.com/3_distributed_workflows.html</a><br>
<br>
All the Best,<br>
<br>
Matt Chapman<br>
Ninjitsu Web Development<br>
<font color="#888888"><br>
--<br>
The contents of this message should be assumed to be Confidential, and<br>
may not be disclosed without permission of the sender.<br>
</font><div class="im"><br>
<br>
<br>
On Thu, Apr 29, 2010 at 2:34 PM, Domenic Santangelo <<a href="mailto:domenics@gmail.com">domenics@gmail.com</a>> wrote:<br>
</div><div><div></div><div class="h5">> 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.<br>
><br>
> 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:<br>
><br>
> 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.<br>
><br>
> 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?<br>
><br>
> Thanks,<br>
> -D<br>
</div></div></blockquote></div><br></div>