The thread about GUIs for git tracking (Sourcetree is the best, btw ;) ) reminded me that I still have a hard time with merging when it arises. What are you guys using? I generally use git-svn for ...