merge conflict reconcileLockfiles passed wrong arguments?

Apologizes if I am reading this wrong but it seems like ours is getting ignored by accident.

What I Wanted to Do

reconcileLockfiles takes three arguments (parent, ours, theirs) and ignores the first.

What Happened Instead

reconcileLockfiles seems to be only passed two arguments (ours, theirs), not passing parent but instead passing ours as the first argument.

This topic was automatically closed 90 days after the last reply. New replies are no longer allowed.