Today I made my first git merge, using EGit(an Eclipse plugin), I had to read a lot of documentation about egit, fix some conflicts and finaly commit the fixes. In the end all worked ok,not great I am not sure I like how the conflict resolving works.