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

[Subclipse-users] Merge produces extra files and decorators

From: Tom Henricksen <TomH_at_A-t-g.com>
Date: 2006-11-07 18:07:37 CET

We are using Eclipse 3.1.2 and Subclipse 1.0.3 on Windows XP with Subversion
1.4. When we merge files I believe Subclipse creates files with extension
like .mine, .r4538, and .r4540. Is there a way to turn this off? Also it
adds decorators in the source file to designate what revision add what file.
Something like the following:
>>>>>> .mine
            if(variable != null) {
<<<<< .r4382
Thanks in advance,
Received on Tue Nov 7 18:09:40 2006

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

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