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

Re: I found a bug?about resolve conflict~

From: Thorsten Schöning <tschoening_at_am-soft.de>
Date: Tue, 10 Sep 2013 08:42:12 +0200

Guten Tag ºÚÉ­ÁÖ,
am Dienstag, 10. September 2013 um 01:07 schrieben Sie:

>> (5)invoke "maked resolved" menu,checked "Resolve conflicts in local file
>> with my changes" option, Test.java file content change bottom:
>> (6)My question is, why don't you into the following this?

Look at 5, you said you want to resolve the conflict with the contents
of your local file from 4 and that's what you got.

Mit freundlichen Grüßen,

Thorsten Schöning

Thorsten Schöning       E-Mail:Thorsten.Schoening_at_AM-SoFT.de
AM-SoFT IT-Systeme      http://www.AM-SoFT.de/
Telefon...........05151-  9468- 55
Fax...............05151-  9468- 88
Mobil..............0178-8 9468- 04
AM-SoFT GmbH IT-Systeme, Brandenburger Str. 7c, 31789 Hameln
AG Hannover HRB 207 694 - Geschäftsführer: Andreas Muchow
Received on 2013-09-10 08:42:50 CEST

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

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