How to resolve conflict between release (live) branch and working (master) branch

Run below commands to setup your GitBase to use Kdiff3 as the git mergetool git config --global --add merge.tool kdiff3 git config --global --add mergetool.kdiff3.path "C:/Program Files/KDiff3/kdiff3.exe" git config --global --add mergetool.kdiff3 ...