[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: Making Your Commit Override Others' Changes to Repository

From: Lübbe Onken <l.onken_at_rac.de>
Date: 2007-05-11 09:40:37 CEST

Stefan Küng wrote:

>>> What's the best way to do that?
>>
>> Move your changes to another location
>> Update your WC
>> Copy your version over the version in your WC
>> Commit
>
> Much easier:
> * update (you'll get a conflict)
> * in the progress dialog (the one showing the update), right-click
> on the conflicted file entry, then chose "Resolve using mine".
> * commit

* wait for the 'build failed' e-mail from your build system, because you
didn't compile & run the app first
Or
* Hire bodyguards for the next 4 weeks, because your colleague is trying to
beat you up

:)

-Lübbe

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Fri May 11 09:40:45 2007

This is an archived mail posted to the TortoiseSVN Users mailing list.