-
Conflict Resolver: February 25, 2011 2:11
Commit 488dd76 on master, committed by Drupal Git User (LDAP)Stripping CVS keywords
-
Conflict Resolver: February 25, 2011 2:11
Commit 6c398a8 on 6.x-1.x, committed by Drupal Git User (LDAP)Stripping CVS keywords
-
Snapshot of the code during the final day of Google Summer of Code. Automatic resolution is implemented and functioning (although it needs a bit more testing when it comes to CCK). Manual resolution is still under heavy development.
-
Almost finished automatic resolution (CCK needs to be double checked), UI for manual resolution is coming together.
-
First attempt at merging title, body, and CCK fields automatically.
-
Added the .install file to create the conflict resolutions table
-
UNSTABLE: The code in its current state will cause an infinite loop in some cases on node update. This commit is purely for mentor review. Thank you.
-
Generating a listing of nodes with conflicts. Currently cleaning up that UI.
-
Fixed merging issues, moving on to identifying conflicts and outputting a unified diff.
-
Updates to the system engine to generate a merged output similar to that of xdiff. Conflicts are NOT being recorded currently. The majority of development here has been the ed processing engine and determining the optimal command line flags and arguments for diff3