Write some notes about editting merges.

diff --git a/notes b/notes
index e5922d2f60fb8476df71c103b634802a2072a01e..4d11ab0c0a2f8a1f793c077230c2e4399c8f8228 100644 (file)
--- a/notes
+++ b/notes
@@ -98,4 +98,37 @@ Speed: us aproxword for pdiff lineup.DONE
 return a lcsl when reading a patch and refine that
 rather than computing from scratch.
 
-FIXME: pdiff should pick best bit, and rediff the two sides. DONE
\ No newline at end of file
+FIXME: pdiff should pick best bit, and rediff the two sides. DONE
+
+---------------------------------
+Thoughts about editing a merge.
+
+When viewing a merge we might decide that:
+
+ - a change is not wanted
+ - a conflict should be resolved for the original
+ - a conflict should be resolved for the new
+
+ - some text needs to be edited in place
+ - a change should be applied against a different place in the original
+
+ - These can apply to a single change, to a line, or to
+   a chunk
+
+We can achieve most of these by changing the merge result,
+e.g. Changed to Unchanged or Conflict to one of the above.
+
+Moving a chunk will require shuffling the merger array.
+
+Replacing text is probably best done with a special merge type??
+
+Selecting the region to act on is awkward.  Need to track 'current'
+merge point for cursor.  Maybe insert  $$ at other end??
+
+How about:
+ press E
+ current change is surrounded with '$'
+ cursor movement can extend the range
+ K to keep original
+ C to change
+ R to retype