Notice: This Wiki is now read only and edits are no longer possible. Please see: https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/wikis/Wiki-shutdown-plan for the plan.
OSEE/HowTo/Commit
How to ... deal with conflicts
A conflict is when the information on the target and destination branches cannot be reconciled.