#842614 dgit pull should do "the right thing" in split brain mode