search

Praqma / git-merge-driver

Example of how to configure a custom git merge driver
MIT License
102 stars 16 forks source link

Is it possible to create this configuration artifact with CLI commands? #1

Open rulatir opened 2 years ago

rulatir commented 2 years ago

I must be able to script registering a merge driver. Can this configuration artifact

[merge "my-custom-driver"]
    name = A custom merge driver used to resolve conflicts in certain files
    driver = my-merge-tool.sh %O %A %B

be somehow created in the configuration using a sequence of git config CLI commands? I don't see a documentation anywhere on how to access values in sections named like [merge "my-custom-driver"] rather than with a single unquoted word like [user].

Your mergetool-setup.sh overwrites any existing config entirely, which is undesirable.

praqma-thi commented 1 year ago

CLI calls to add merge driver configs might be out there, but I'm not aware of them.

You could modify the mergetool-setup.sh to be a little smarter so it checks for existing configuration and appends the block in case it doesn't exist? Shouldn't be too hard.

This repo was only ever meant to serve as a simple example. Its organisation is defunct and I've long lost permissions to it. I only just noticed your issue through pure chance.