Resolve merge conflicts and commit an updated version to a repository.
This use case extends commit.
Flow
Basic Flow
When the UC commit scenario fails because someone else committed a version while you were editing yours, the flow continues like this:
- Editor fetches the latest version and now has three versions locally: the original version he started with, the working copy he is trying to commit and this latest version.
- Editor reviews the three way diff and updates the working copy.
- Editor tries to commit the working copy again, now referencing the latest version again. This is the normal commit use case.
Alternative Flows
- None.
Details
This use case interacts with the commit use case and the user can go back and forward between the two as long as new merge conflicts pop up.