Reputation: 55
With Nodegit, can I can pass a custom merge callback that will get called whenever there is a merge conflict? The Merge.merge function accepts mergeOpts, which has a variable named 'defaultDriver' with type 'string'. But I am not able to findout any examples that use it.
Merge.merge(repo, theirHead, [mergeOpts], [checkoutOpts]);
Does anyone know how it works?
Upvotes: 0
Views: 40