search

dmusican / Elegit

A GUI client for people who want to learn Git.
MIT License
30 stars 7 forks source link

Conflict resolution #630

Closed mgorra closed 6 years ago

mgorra commented 6 years ago

This branch has a tool to help with resolving conflicting merged files, along with minor edits to adding conflicting files etc. There are a number of minor and major features that could be added, but the tool functions well.