/MerGit

Tool to merge git conflicts

Primary LanguagePython

MerGit

Tool to merge git conflicts which was created for a school project. The goal was to make a basic tool which can quickly tab through conflict markers formed by merging files in git hub.

Requirements

  • Python 3
  • pygame
  • PyQt5

Running the Application

launch entry_point.py