-
Committer:
Romain Chalumeau
-
Date:
2010-07-16 14:50:26 UTC
-
Revision ID:
rchalumeau@echo.fr-20100716145026-28mtr4yyiu1yle0s
ConflictFromMerge exception
When a merge directive produces conflicts, a conflictFromMerge exception is raised.
The msg of the exception gives a complete report to ease the integrator solving the conflict ie :
- branch url which causes the conflict
- files in conflict
- authors who have committed the conflicted modifications
- path where to handle the conflicts