Comment 2 for bug 34956

Revision history for this message
Martin Pool (mbp) wrote :

Confirmed; agree that more information on the conflict would help.

Ideally we would also note a file-id join to allow better future merges.