Skip to content

Merging with a custom merge driver #656

@jonsongoffwhite

Description

@jonsongoffwhite

There is a merge driver present in my repository, which is set up in config and attributes, and it works correctly via the command line, however when merging using repo.mergeBranch()
(- (BOOL)mergeBranchIntoCurrentBranch:(GTBranch *)fromBranch withError:(NSError **)error;),
the merge driver doesn't seem to be used.

Am I missing something, or is this something that's not implemented?

Thanks!

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Type

    No type

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions