From Fedora Project Wiki
(Comment is obsolete) |
|||
| Line 1: | Line 1: | ||
== Merging (request for discussion and inclusion on the main page) == | |||
Merging issues can be made much easier to solve with the following instructions: | |||
<code> | |||
yum install meld | |||
</code> | |||
Then configure git to use meld for merging: | |||
<code> | |||
git config --global merge.tool meld | |||
</code> | |||
Then, when merge conflicts occur, it can be resolved in a very nice, graphical interface by using the command: | |||
<code> | |||
git mergetool | |||
</code> | |||
Revision as of 11:56, 2 August 2010
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