For Drupal: Pro Drupal Development<div>For Git: Pro Git - <a href="http://progit.org/">http://progit.org/</a><br><br></div><div>Victor Kane</div><div><a href="http://awebfactory.com.ar">http://awebfactory.com.ar</a></div><div>
<a href="http://projectflowandtracker.com">http://projectflowandtracker.com</a></div><div><br><div class="gmail_quote">On Thu, Apr 29, 2010 at 6:34 PM, Domenic Santangelo <span dir="ltr"><<a href="mailto:domenics@gmail.com">domenics@gmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">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>
<font color="#888888">-D</font></blockquote></div><br></div>