You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
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.
The text was updated successfully, but these errors were encountered:
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.
I must be able to script registering a merge driver. Can this configuration artifact
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.The text was updated successfully, but these errors were encountered: