docs/OSEE/HowTo/Commit.md - osee/org.eclipse.osee - Git at Google

 ## 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")
	## 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")