Closed (fixed)
Project:
Conflict Resolver
Version:
6.x-1.x-dev
Component:
Code
Priority:
Critical
Category:
Task
Assigned:
Reporter:
Created:
24 May 2009 at 22:00 UTC
Updated:
21 Jul 2009 at 15:24 UTC
Generate a patch based off of the diff and apply it to create the new working copy of the node.
Comments
Comment #1
bradfordcp commentedPatches are not in use here as the various backends perform the merging for us and return any conflicts that may occur. Patch has been removed from the equation.