Quantcast
Channel: GIT ADD - News RSS Feed
Viewing all articles
Browse latest Browse all 5189

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

$
0
0
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 ...

Viewing all articles
Browse latest Browse all 5189

Trending Articles