git-workflow/autogits
SHA256
19
0
Fork 8
Code Issues 43 Pull Requests 6 Projects 2 Activity
Files
submodulemerge
autogits/utils/gitmodules-automerge
History
Adam Majer d5d6910906 Add command line utility to automerge conflicts 
It assumes CWD is the root of the git project
2025-10-29 13:01:25 +01:00
..
main.go
Add command line utility to automerge conflicts
2025-10-29 13:01:25 +01:00
README.md
Add command line utility to automerge conflicts
2025-10-29 13:01:25 +01:00

README.md

Purpose

Automatically resolve git configlicts in .gitmodules if there's a conflict due to a merge.

It uses HEAD and MERGE_HEAD to calculate merge base and pass it to the conflict resolution