Conflicts under TSVN

I am wondering what is the "correct" way to resolve conflicts when using
TSVN.

Three cases come up:

1) I need to resolve some conflicts with my version and the HEAD that
was just pulled down. How do people do this? I tried using the GUI
tools that TSVN brings up to allow you to select sections from on
revision or another and this seems very cumbersome. Just finding the
lines in my normal editor seems to work best.

2) I want to junk my changes and just use the new file.
3) I want to junk the new file and just blindly use mine.

There doesn't seem to be a quick way to do 2 or 3. Is there? If I want
to junk my changes, I just delete my file (and the other 3 files the
conflict created) and do a new update. This seems wrong.

If I want to keep my changes, then I copy the .mine and mark it
resolved. This works, but it's a lot of deleting and renaming, etc.
Can TSVN just do this in one step?

Thanks

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Nov 18 21:33:36 2005