Conflict while using "bzr pull"

[duchier at ps.uni-sb.de]

Aaron Bentley <aaron.bentley at utoronto.ca> writes:

> James Blackwell wrote:
>> On Mon, Dec 12, 2005 at 09:53:28AM -0500, Aaron Bentley wrote:
>>>Perhaps "bzr revert --pristine" would delete all unversioned files as
>>>well as restoring source files to the correct names and contents.
>
>> -1 to pristine. Though archers know it, it not in the common venacular.
>
> If there's common vernacular, we should use it.  Otherwise, I think
> "pristine" is an accurate term, and a reasonably well-known word.

--clean perhaps?

--Denys