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~

------------------------------------------------------
http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=3064222

To unsubscribe from this discussion, e-mail: [[email protected]].