Tag: git

The Coolest Merge EVER – My take

Linus Torvalds wrote about “The coolest merge EVER!” back in June 20051 now I needed to do something similar a while back.

I had two git repositories that I use for database backup, the two repositories contains backup from a different mysql server in a master-slave setup and therefor contains mostly the same data. This… Read more »

Started on Git

I’m currently learning, how to use git and plan to move my private svn-repository to git soon.

I just stumbled up on the site http://gitcasts.com that has some short video courses in using git.

Git is somewhat different from subversion(svn) and introduces some new concepts for me, namely the local index, remote-repository, rebasing, branching (never used it in svn)… Read more »