Probably after merge in git you could be faced with an issue about how to resolve unsuccessful merges.
In our solution we’ll use gui merge tools, which will help resolve our conflicts by hand.
So, for example, after merging some of the project files could arise with mark CONFLICT :
It happens when auto-merging tool fails, and after that we need to resolve conflicts by hand.
Git have a wrapper for merge tool, which could be called with git mergetool, if you try to run it, git will fail :
To use this wrapper we are going to configure GUI merge tools, we should choose one from several good of them :
TortoiseMerge (note, that TortoiseGit or TortoiseSvn should be installed first)
All of the approaches listed below based on modifying the .gitconfig file in a user folder (For ex. C:\Users\user).
We need to configure .gitconfig by adding additional lines, different for every GUI tool.
Setting up WinMerge with git
Setting up KDiff3 with git
Setting up TortoiseMerge with git
Using git mergetool and git difftool
After successful modification of .gitignore we are able to use merge tools in a console, for example :