Innesta HelpConflictsConflictsThe three-pane editor, and settling the hunks that need no decision.When a merge conflicts What Git has stopped for, how to find the files, and what finishing looks like.The three-pane editor Ours, theirs, and the result you are writing between them.Resolve Simple Conflicts Settling, in one action, only the hunks that have one possible answer.