Comment 7 for bug 235407

David, can I check whether you also used merge --force leading up to this?

David/Frits: why did you use merge --force? Was there some other operation that needed to be forced, or was it giving you an error before, or do you just do it out of habit?