Resolve Merge Conflict with 'git mergetool' and meld

If you work with your friends on the same git repository, you might edit the same file. If you edit the bottom and your friend edits the top, git merges the changes automatically. If two users edit the same line, … Continue reading

Posted in Uncategorized | Tagged , , , , , , | 1 Comment