I read an article about three-way merges (diff3). He gives an example about how detect a conflict. His example is :
A=[1,4,5,2,3,6] O=[1,2,3,4,5,6] <<< Origin B=[1,2,4,5,3,6] In the first time he computes the diff between O-A and after O-B: A=[1,4,5,2,3, ,6] O=[1, ,2,3,4,5,6] and O=[1,2,3,4,5, ,6] B=[1,2, ,4,5,3,6] After it makes diff3 parse: A=[1,4,5,2, 3 ,6] O=[1, ,2, 3,4,5 ,6] <<< Origin B=[1, ,2, 4,5,3 ,6] And after it detects the conflict : 1 4 5 2 <<<<<<<<<A 3 |||||||O 3 4 5 ======= 4 5 3 >>>>>>B 6 Following this method to detect the conflict, i try a simple example : initially i have the document : a; b; i make an updates user 1 update "a;", to "a=0;" user 2 update "b;", to "b=0;" I obtain this result : xx <<<<<<< A int a=0; int b; ||||||| O int a; int b; ======= int a; int b=0; >>> When i merge these two document i have a conflict even if i don't change at the same position (a and b are not at the same position)! some one can explain me why i have this conflict ? -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
