Re: I found a bug?about resolve conflict~

[Thorsten Schöning]

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

I found a bug?about resolve conflict~

[??????]

 (1)myeclipse1 create java file content:
 package test;

 public class Test {

 public static void main(String[] args) {
 System.out.println(1);
 System.out.println(2);
 System.out.println(3);
 System.out.println(4);
 System.out.println(5);
 System.out.println(6);
 System.out.println(7);
 System.out.println(8);
 System.out.println(9);
 System.out.println(10);
 }

 }
 commit it to test1 repository
 (2)checkout test1 repository to desktop test22 directiroy.
 (3)test22 import to myeclipse2 and edit java file content:
 package test;

 public class Test {

 public static void main(String[] args) {
 System.out.println(1);
 System.out.println(2 2);
 System.out.println(3 2);
 System.out.println(4 2);
 System.out.println(5);
 System.out.println(6);
 System.out.println(7);
 System.out.println(8);
 System.out.println(9);
 System.out.println(10);
 }

 }
 commit to test1 repository.
 (4)show myeclipse1 Test.java file edit it content:
 package test;

 public class Test {

 public static void main(String[] args) {
 System.out.println(1);
 System.out.println(2);
 System.out.println(3);
 System.out.println(4 1);
 System.out.println(5 1);
 System.out.println(6 1);
 System.out.println(7);
 System.out.println(8);
 System.out.println(9);
 System.out.println(10);
 }

 }
 and invoke Update menu.
 content change bottom:
 package test;

 public class Test {

 public static void main(String[] args) {
 System.out.println(1);
  .mine
 System.out.println(2);
 System.out.println(3);
 System.out.println(4 1);
 System.out.println(5 1);
 System.out.println(6 1);
 ===
 System.out.println(2 2);
 System.out.println(3 2);
 System.out.println(4 2);
 System.out.println(5);
 System.out.println(6);
  .r4
 System.out.println(7);
 System.out.println(8);
 System.out.println(9);
 System.out.println(10);
 }

 }

 (5)invoke maked resolved menu,checked Resolve conflicts in local file
 with my changes option, Test.java file content change bottom:
 package test;

 public class Test {

 public static void main(String[] args) {
 System.out.println(1);
 System.out.println(2);
 System.out.println(3);
 System.out.println(4 1);
 System.out.println(5 1);
 System.out.println(6 1);
 System.out.println(7);
 System.out.println(8);
 System.out.println(9);
 System.out.println(10);
 }

 }
 (6)My question is, why don't you into the following this?
 package test;

 public class Test {

 public static void main(String[] args) {
 System.out.println(1);
 System.out.println(2 2);
 System.out.println(3 2);
 System.out.println(4 1);
 System.out.println(5 1);
 System.out.println(6 1);
 System.out.println(7);
 System.out.println(8);
 System.out.println(9);
 System.out.println(10);
 }

 }
 (7)Thank you lot~