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 and evaluate it. If you do not like that try another one. In this model when we start to …
Tag Archives: merging
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 Perforce P4Merge Visual Merge Tool from https://www.perforce.com/downloads/integrations Select the operating …
Continue reading “Merging in Git with four panels in Windows”