go-merge-drivers

go-merge-drivers

git merge drivers [1] for go.mod and go.sum files.

Allows seamless editing from multiple members of the team, bumping to the latest version supported automatically on merge.

To Use the Go driver

Define a merge driver like this in .git/config:

[merge "go"]
	name = Go merge driver
	driver = go run github.com/crystalix007/go-merge-drivers/cmd/go-merge/ -O %O -A %A -B %B -P %P --output %A

Then define gitattributes that use this driver:

go.mod merge=go
go.sum merge=go