Version 1 (modified by JasonDagit, 8 years ago) (diff)



  • Create conflicted patch type to store conflicted patches, and associated commutation rules
  • Create a new merge algorithm that handles conflicts by generating conflicted patches


  • Prove the merge algorithm gives the same answer regardless of merge order
  • Create Named primitive patches
  • Create cancellation patches for marking conflicted (and other types of patches) as canceled.
  • Storage implementation for unresolved conflicts (store a set of conflicted parallel patches)
  • unmerge, needed when something is canceled
  • UI for working with conflicts