Error: 1 conflict prevents checkout - when merging clean working directory #941
Description
Hello,
i am trying to pull changes from a Repository. My working directory is clean but i am getting the error stated in the title.
My merge code looks like this:
var mOpts = new NodeGit.MergeOptions();
NodeGit.Merge.initOptions(mOpts, 1);
mOpts.fileFavor = NodeGit.Merge.FILE_FAVOR.THEIRS;
repository.mergeBranches(dbRepo.branch, 'origin/' + dbRepo.branch, signature, NodeGit.Merge.PREFERENCE.FASTFORWARD_ONLY, mOpts);
I'm not sure if this is the right way to use the merge options.
Thanks in advance.
Reactions are currently unavailable