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
and I wonder the algorithm how git recognizes the conflict... or how
git automerges...
I searched internet, git documentation but to no avail.
Thank you in advance
KwH Kim