Making Your Commit Override Others' Changes to Repository

Let's say that I've committed a change, and then made my own changes,
but have not yet committed them.

My co-worker has updated his code to receive the changes I most
recently committed. And he's made his own changes. Then he commits
his.

If I try to commit, I'll get a conflict.

But what if I know the changes he committed and know that I just want
to have my version overwrite what is in the repository (i.e.
essentially discard his most recent commit).

What's the best way to do that?

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Thu May 10 19:58:36 2007