Notice: this Wiki will be going read only early in 2024 and edits will no longer be possible. Please see: https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/wikis/Wiki-shutdown-plan for the plan.
Difference between revisions of "OSEE/HowTo/Commit"
(Replacing page with '*'''How to ... Resolve conflicts'''') |
(→How to ... deal with conflicts) |
||
| (One intermediate revision by the same user not shown) | |||
| Line 1: | Line 1: | ||
| − | *[[OSEE/HowTo/ResolveConflicts|''' | + | ==How to ... deal with conflicts== |
| + | |||
| + | A conflict is when the information on the target and destination branches cannot be reconciled. | ||
| + | *[[OSEE/HowTo/Commit/ResolveConflicts|'''Resolve conflicts''']] | ||
Latest revision as of 08:31, 30 April 2010
How to ... deal with conflicts
A conflict is when the information on the target and destination branches cannot be reconciled.