-
Task
-
Resolution: Obsolete
-
Major
-
None
-
None
-
Sprint 3
A concrete conflict resolver that can uses DiffMatchPatch to resolve conflict. This resolver should be configurable to allow for auto-merging.
- is blocked by
-
AEROGEAR-4633 Conflict resolution handling
- Closed