Breezy

  1. Bug #364336
  2. Comment #1

Comment 1 for bug 364336

Revision history for this message
Vincent Ladeuil (vila) wrote :

The conflict should occur only once, subsequent merges should just respect the local decision to delete the file.

Are you experiencing repeated conflicts ?