Talk:Using Fedora GIT

Merging (request for discussion and inclusion on the main page)
Merging issues can be made much easier to solve with the following instructions:

Then configure git to use meld for merging:

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