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

[TSVN] FW: TortoiseSVN: can a turn of atomatic merging when resolving co nflicts?

From: Lübbe Onken <l.onken_at_rac.de>
Date: 2005-10-07 12:08:01 CEST

Forwarding to dev list

  _____

From: Ruud Merkx [mailto:ruud.merkx@philips.com]
Sent: Friday, October 07, 2005 12:07 PM
To: luebbe@tigris.org
Subject: TortoiseSVN: can a turn of atomatic merging when resolving
conflicts?

Hi Luebbe,

In our project we use TortoiseSVN and we have some problems when resolving
conflicts.
It seems the tool does automatic merges, or at least touches our code
unwantedly,
by inserting "merge" lines. Leaving the developer to check where something
was merged.
Can I in some way (option, configuration setting) prohibit this kind of
behavior?

Greets,

Ruud Merkx
Philips TASS

HCZ-141
Tel: +31 40 27 57873 / 55288
E-Mail: Ruud.Merkx@philips.com
Received on Fri Oct 7 12:08:30 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.