I found a bug?about resolve conflict~

2013-09-09 Thread ??????
> (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.o

Re: I found a bug?about resolve conflict~

2013-09-09 Thread 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