I do not agree here. Of course, the solution is: a c b
It follows the principle of least surprise. If you want to make very strange things with merges, do not use a tool with automatic merge. Do it manually. Also, the merge of two equal lines, one with unix line end and the other with Windows line end, should not give any difference. At the end, the merge algorithm is subjective and can do whatever his developer thinks is more convenient to serve their users. RR 2011/3/4 Will West <[email protected]>: > I'd go further, and say that the same change happening separately in > two branches is a conflict. Given initial content > > a > b > > For feature foo Bob changes it to > > a > c > b > > for feature bar Tom changes it to > > a > c > b > > When you want a branch with both features foo and bar, there isn't a > reasonable way for any merge algorithm to detect whether you need > > a > c > b > > > OR > > a > c > c > b > > OR perhaps something more like > > a > cc > b > > These decisions are outside the scope of what I would expect from > automatic merge to understand. > > Regards, > > -- > Will Owen West > 512.589.0578 > _______________________________________________ > fossil-users mailing list > [email protected] > http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users > _______________________________________________ fossil-users mailing list [email protected] http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
