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

Re: [TSVN] TortoiseMerge Feature Request

From: Rainer Müller <mueller_rainer_at_gmx.de>
Date: 2005-04-06 22:10:20 CEST

Paul Welter wrote:
> Add a command line option to auto merge the documents when there are no
> conflicts. So if /base /theirs /yours and /merged are set and there are
> no conflicts, the documents would be automaticly merged and no dialog
> would come up. This would all TortoiseMerge to be used in a batch file
> to merge documents automaticly if no conflicts.

Subversion already merges without a conflict warning if possible AFAIK.
You just get a notice about merged files. A conflict is the situation
when a programm can't make the right decision what to keep and what to

You should find more about this merging in the Subversion book...

Hope that helps,

To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Wed Apr 6 23:42:23 2005

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

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