Replies
-
|
This was a user environment error for us - the merge driver had to be on the path (and we thought it was already). |
Beta Was this translation helpful? Give feedback.
0 replies
-
|
Merge drivers will only be picked up if merges are performed by git itself, which can typically be achieved by using |
Beta Was this translation helpful? Give feedback.
0 replies
Answer selected by
Byron
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
-
In our command line implementation, we have created a git custom merge driver by modifying .gitattributes and .gitconfig. Is there a way to have the same custom merge driver used with gitpython? Or can we implement something similar? The custom merge driver automatically takes/uses the version with the latest commit time. Thanks!
Beta Was this translation helpful? Give feedback.
Merge drivers will only be picked up if merges are performed by git itself, which can typically be achieved by using
repo.git.merge(…). Using git directly is described here in greater detail.