Versions involved in a typical merge
Main has versions 4 through 8. The r1_fix branch has versions 0 through 6. The base contributor is version 4 on main; the target contributor is version 8 on main, from which a dashed line runs to a striped version (checked out) marked as merge output file. A merge arrow connects version 4 in r1_fix to the merge output file. Version 6 in r1_fix is marked as Contributor.