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.
- Python 3
- pygame
- PyQt5
launch entry_point.py
Tristhal/MerGit
Folders and files
| Name | Name | Last commit date | ||
|---|---|---|---|---|