Branching and merging in Git
Branching and Merging are very powerful features in Git. There are may branching strategies, my favorite is well explained at http://nvie.com/posts/a-successful-git-branching-model/ Pick any model you like and stick to it for a while to better understand…
Merging in Git with four panels in Windows
Git is a great repository for small and large projects. It is easy to create and merge branches to separate code for the features you work on. To make merging easier you can use a free 4 panel merging tool, Perforce P4Merge. Download Download the…