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 (
theirs) and ignores the first.
What Happened Instead
reconcileLockfiles seems to be only passed two arguments (
theirs), not passing
parent but instead passing
ours as the first argument.