How do I revert an unversioned file?

Alexander Belchenko bialix at ukr.net
Fri Jan 14 09:27:46 UTC 2011


Vincent Ladeuil пишет:
>>>>>> Alexander Belchenko <bialix at ukr.net> writes:
> 
> <snip/>
> 
>     > It's applicable to contents conflicts, which either for binary files
>     > or... hmm I don't remember what is another case for getting contents
>     > conflict.
> 
> Try 'bzr help conflict-types' to refresh your otherwise very good
> understanding ;)

Yep, I remember now:

"... It can even happen with files that are deleted on one side, and 
modified on the other."

Very rare situation for me that's why I forgot.

Cheers,
Alexander

-- 
All the dude wanted was his rug back



More information about the bazaar mailing list