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"
(→How to ... deal with conflicts) |
|||
| Line 2: | Line 2: | ||
A conflict is when the information on the target and destination branches cannot be reconciled. | A conflict is when the information on the target and destination branches cannot be reconciled. | ||
| − | *[[OSEE/HowTo/ResolveConflicts|'''Resolve conflicts''']] | + | *[[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.