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
-
Notifications
You must be signed in to change notification settings - Fork 0
Tristhal/MerGit
Folders and files
| Name | Name | Last commit message | Last commit date | |
|---|---|---|---|---|
Repository files navigation
About
Tool to merge git conflicts
Resources
Stars
Watchers
Forks
Releases
No releases published
Packages 0
No packages published