Files
autogits/utils/gitmodules-automerge
Adam Majer 03868953fd
Some checks failed
go-generate-check / go-generate-check (pull_request) Failing after 30s
Add command line utility to automerge conflicts
It assumes CWD is the root of the git project
2026-02-21 14:18:45 +01:00
..

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