Introduction

A couple of days ago I posted an article talking about our migration from SVN to Git. During our first handful of days working with Git our team found several friction points hindering our daily work flow and we all did some things really wrong. But com’on after all we are learning, right?

In this post I want to share some of our findings.

Where is my blame feature?

Working with SVN and the Visual.SVN plugin for Visual Studio one can right click in any code file and call blame. A really handy feature. How can we do such a thing in with git without having to type a lot? First possibility is to use the git blame command. But this needs a lot of typing if the relevant file is located in a highly nested subfolder.

git blame /subfolder1/subfolder2/subfolder3/FileIWantToBlame.cs

not very wrist friendly I want to say.

Second way is to use gitk. Type gitk in the bash shell and right click on the file you want to blame and select “blame parent commit”. But this only works if the file has been modified otherwise it is not available in the list of changed files and thus cannot be accessed.

I wonder whether there is not a easy way to blame directly from within Visual Studio? Any suggestions…?

Help, I have merge conflicts

When merging or rebasing we might run into merge conflicts that cannot automatically be resolved by git. We can then just call git mergetool

 <font face="Courier New"></p> 

$ git mergetool