Thus said Scott Robison on Thu, 16 Apr 2015 21:00:50 -0600: > Partly I think it is because your test case consists of a single file > of a single line, which means probably (I would think) every merge > resulted in a conflict that you had to resolve manually.
Yes, every merge is a conflict which I resolve arbitrarily by leaving just one of the conflicting changes. > Effectively, the line from newbranch was deleted and the line from > trunk was inserted, so by the time of the merge there is nothing new > or changed in newbranch to merge into trunk. That's effectively what seems to be happening. Even though ``file'' is different on newbranch, when I merge it into trunk, it doesn't consider the contents of ``file'' as being in conflict---which surprised me. All other merges resulted in conflict resolution that had to happen. So I was expecting conflict resolution when I merged in the branch---there was none. I'm still a bit confused why it didn't think there was a conflict and just chose instead to take the content from trunk (which is why it shows no differences). Thanks for your response. Andy -- TAI64 timestamp: 4000000055309290 _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
