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
