From Fedora Project Wiki

Revision as of 08:39, 25 September 2014 by Adamwill (talk | contribs) (Adamwill moved page Talk:Using Fedora GIT to Talk:Package maintenance guide: This is a better name. No-one else on earth capitalizes "git", and git is an implementation detail. This is about to get a dump of stuff from the 'package update HOWTO...)

Merging (request for discussion and inclusion on the main page)

Merging issues can be made much easier to solve with the following instructions: 

yum install meld

Then configure git to use meld for merging: 

git config --global merge.tool meld

Then, when merge conflicts occur, it can be resolved in a very nice, graphical interface by using the command: 

git mergetool

Retrieved from "https://fedoraproject.org/w/index.php?title=Talk:Package_maintenance_guide&oldid=388757"