[development] Git.. wat?

[Gordon Heydon]

Hi,

Most of them have given you the books, and other basic links. A couple of presentations that I found very useful.

1. A presentation by Linux Torvalds at google http://www.youtube.com/watch?v=4XpnKHJAok8
2. Another presentation at google by Randal Schwartz http://www.youtube.com/watch?v=8dhZ9BXQgc4

both interesting talks.

Gordon.

On 30/04/2010, at 7:34 AM, Domenic Santangelo 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