## How to ... deal with conflicts

A conflict is when the information on the target and destination
branches cannot be reconciled.

  - [**Resolve
    conflicts**](/docs/OSEE/HowTo/Commit/ResolveConflicts.md "wikilink")