HomeConflicts⚡⚡ConflictsConflicts are objects in the repository, not damage to your working tree.By Dustin•8 articlesA conflict is an object, not a broken checkoutList every open conflictResolve conflicts interactivelyTake one sideResolve a delete-modify or rename-renameAccept what is already on diskResolve one region at a timeLet an AI plugin propose a resolution