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

Unexpected merge left intentionally deleted line in place

From: Dave Reed <dreed_at_cmal.com>
Date: Wed, 4 Apr 2012 12:07:27 -0700 (PDT)

I committed a file after deleting a line of code.

On another machine I then updated the same file.

But, instead of replacing the file with the latest revision, a merge was performed -- without asking me. This merge kept in place the line of code I was trying to delete.

What should I do differently?



To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-04-04 21:08:20 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.