Merge conflict resolution mode which allows individual conflicts to be examined, repaired, and revised in conjunction with branch comparisons, history support, resolution staging, and resolution impact analysis. These features are meant to address developer problems and needs from merge conflict tools (per ICMSE'17 paper).