Comment 2 for bug 414589

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

There are several ways to look at this bug, but I think in that case, it's due to etckeeper adding files, generated by bzr to help resolve conflicts, and seen as unknown.

Can you explain what workflow you used that ended up in such files being added ?
In particular, how did you solve (or not !) the conflicts that led to the creation of these files ?

Anyway, I think the description of this is quite good as bzr shouldn't (at least by default) accept to 'add' files that are known to be associated with existing conflicts.