Please use "Reply to all" on this mailing list and please do not top-post. Am 06.09.24 um 07:09 schrieb KwonHyun Kim: > Thank you for the answer, > > Is there any other exceptions from line-by-line change? > > Can I ask you of any reference? Another "exception" would be a modify-delete conflict, i.e., where one side modifies the file and the other deletes it. Apart from that, you would have to dig into the source code. -- Hannes > > -- KwH Kim > > 2024년 9월 6일 (금) 오전 1:39, Johannes Sixt <j6t@xxxxxxxx>님이 작성: > >> >> Am 05.09.24 um 16:10 schrieb KwonHyun Kim: >>> Hi, there. >>> >>> At first, I thought it's determined by line. >>> >>> But as I experimented, it does not look so. >>> >>> Here's what I experimented >>> >>> merge-base ==== >>> >>> hi all >>> >>> branch BrA === >>> >>> hi everyone >>> >>> branch BrB === >>> >>> hi all >>> good to see you >>> >>> when I merge BrB from BrA, I get conflicts. >>> >>> but the first line is only changed in BrA, >>> and BrB added a line so there is no reason to have a conflict... >>> that's what i think >> >> If the changes in the two branches are in adjacent lines, then that is >> considered a conflict as well. >> >> -- Hannes >>
