@kristopherw I see; in that case you just have to manually merge them together, usually both of you would have to sit down and work out the correct merge. It's easiest when you can just overwrite with one commit or another, but that's not always the case.