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

Re: easy way to find conflicted files

From: Johan Appelgren <johan.appelgren_at_gmail.com>
Date: 2005-01-26 16:43:34 CET

On Wed, 26 Jan 2005 16:07:21 +0100, Mage <mage@mage.hu> wrote:
> Hello,
>
> let's imagine that my merge or update generates conflicted files, but I
> have to turn off my computer and I forget the file names whose were
> conflicted. How can i find them later? I have noticed that merge
> generates filename.merge.work, I suppose that update generates
> filename.update.work?

http://svnbook.red-bean.com/en/1.1/svn-book.html#svn-ch-3-sect-5.3.1

If you run "svn status" in your working copy all conflicted files will
have a 'C' in the status column.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Jan 26 16:52:40 2005

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