[Scummvm-devel] Re : On using git correctly: Rebase vs. merge

[Filippos Karapetis]

A very good explanation. Alyssa (fuzzie) and subsequently Willem (wjp) also
provided an
explanation of what went wrong in that commit, but Max's explanation is much
more detailed,
and well written.

At least my mistake makes me a bit glad I messed up, so that this won't
hopefully happen again
in the future :)

I'll just add three more pages to the ones mentioned already, in case people
find them useful:
https://git.wiki.kernel.org/index.php/GitSvnCrashCourse - a crash course on
Git, for people
with SVN knowledge
http://www.kernel.org/pub/software/scm/git/docs/git-merge.html - the Git
manual on merge,
explaining merges, conflicts and how to avoid them
http://www.kernel.org/pub/software/scm/git/docs/everyday.html - the top 20
essential Git
commands, so that people won't get initially lost in the different available
commands

Regards,
Filippos

-- 
"Experience is the name every one gives to their mistakes" - Oscar Wilde
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.scummvm.org/pipermail/scummvm-devel/attachments/20110215/9a724737/attachment.html>