[TYPO3-mvc] FYI: Migrating to Git/Gerrit

[Michael Knoll]

Hi Franz,

I'm kind of happy to hear such things from you, as I had the same 
problems at the beginning and felt like a complete idiot.

I can tell you that working with git for some months now change my mind 
completely. I would absolutly never switch back to SVN and its crappy 
merging and non-distributetness :-)

I can recommend you this book, which - besides explaining the commands 
and workflows - also give a nice "behind-the-scenes" which makes it 
easier to understand what git does:

http://www.amazon.de/Pro-Experts-Voice-Software-Development/dp/1430218339/ref=sr_1_1?ie=UTF8&qid=1296206128&sr=8-1



Greetings

Michael



Am 26.01.11 12:44, schrieb Franz Koch:
> Hey,
>
>> I have for long time working with svn and understanding its concept, but
>> now seems like git is more and more used and I still don't get into it
>> yet.
>
> I also don't get started with git. Just yesterday I wanted to pull the
> most recent version from a git repo and it said that it couldn't merge
> files because I did local modfications. It suggested me to "stash" my
> changes first. WTF, can't git simply merge files or ask to resolve
> conflicts like SVN did? Can't imagine that I always have to clean up my
> local repo first.
>
> Does anybody know a good git tutorial/documentation which is not just
> describing method by method but giving workflow examples?
>