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.schoen...@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
