Simon 'corecode' Schubert wrote: [...] > if updating with -C you will actually lose the changes made (but i think > they will be moved to a .#file.rev), otoh, you won't get merge conflicts.
Right. That is generally what I want, since I'm not a developer and I don't generally do merges. I'm generally just testing patches from other people so I don't want any merge conflicts and/or 'reversed-patch' errors.
