Git Mergetool - Merging With a GUI - GitGuys - GitGuys: "Merging With a GUI
Git can also work with a large number of GUI tools for helping with merging. A couple of popular GUI tools used on Linux are kdiff3 and meld. They are worth trying (you may need to install them if they aren’t installed yet).
Back To The Same Old Conflict
We’ll go back to the conflict in the the second line of the README file, from our repository as described in the Merging Branches With a Conflict page.
Merging with kdiff3
If you want to try out kdiff3 you could type:"
'via Blog this'
No comments:
Post a Comment