git (msys) + merge + araxis

I struggled with setting up the git environment for my windows environment.
And since it's easy to forget these things, I'll just add the command lines for it here: