In this situation, the fresh new you can easily resolutions are to contain the re-added adaptation, or remain a person modified type, replacing the latest re-added type (drop isn’t a valid resolution).

There is no particularly topic because the a fallen/modified directory; in case your list was blank, the only you’ll change is actually rename, that’s forgotten.

When your list isn’t blank, that creates a separate matter of fell/modified file disagreement; in the event your file try remaining, it should additionally be renamed to an existing index.

Incorrect Term Conflict

Monotone reserves title _MTN for the a workplace root index to have interior play with and you can food it identity while the unlawful to have a good versioned document otherwise index into the the project options. This name’s legal having a beneficial versioned file otherwise list while the long since it is outside the project options index.

Invalid title disputes would be very rare since it is unlikely you to a programs options directory will be different. It’s a great deal more impractical you to a programs root directory will transform while the the brand new root list have a tendency to include a document or directory named _MTN .Continue reading→