git mergetool for easy conflict resolution using any editor
Geek Repo:Geek Repo
Github PK Tool:Github PK Tool