#
#
# add_file "wiki/Branches/nvm.resolve_conflicts.mdwn"
#  content [7aa788c8f9f385e9e0ee278ba7ab1a396c912a19]
# 
# add_file "wiki/Branches/nvm.stephe.mdwn"
#  content [cb3fe9f2caed33866302a6d3549a4e60eedbc96b]
# 
# add_file "wiki/People/StephenLeake.mdwn"
#  content [28c82ec84a77ab24e49099ceea685effa340b907]
# 
# patch "wiki/Branches/nvm.automate_show_conflict.mdwn"
#  from [b19462be1f0c7b2bca6eaae8a645fe1647627a8a]
#    to [4a636568d66b313e4669186e8db912042b10e5e9]
#
============================================================
--- wiki/Branches/nvm.resolve_conflicts.mdwn	7aa788c8f9f385e9e0ee278ba7ab1a396c912a19
+++ wiki/Branches/nvm.resolve_conflicts.mdwn	7aa788c8f9f385e9e0ee278ba7ab1a396c912a19
@@ -0,0 +1,10 @@
+[[!tag migration-done]]
+Contact: [[People/StephenLeake]]
+
+Provide simple flow to resolve non-content conflicts.
+
+Strategy: Add `conflicts store``, `conflicts resolve_*` commands, to
+let the user specify conflict resolutions asynchronously from the
+merge process.
+
+Status: [[status/landed]]
============================================================
--- wiki/Branches/nvm.stephe.mdwn	cb3fe9f2caed33866302a6d3549a4e60eedbc96b
+++ wiki/Branches/nvm.stephe.mdwn	cb3fe9f2caed33866302a6d3549a4e60eedbc96b
@@ -0,0 +1,12 @@
+[[!tag migration-done]]
+Contact: [[People/StephenLeake]]
+
+Random small jobs.
+
+Add --reverse option for 'diff', to specify direction for diffs involving the workspace; landed.
+
+Fix 'conflict' to handle directories, add 'keep' resolution.
+
+Strategy: write tests that break, fix code till they pass.
+
+Status: [[status/Work_In_Progress]] tests passing; ready to land. Need to merge from main first.
============================================================
--- wiki/People/StephenLeake.mdwn	28c82ec84a77ab24e49099ceea685effa340b907
+++ wiki/People/StephenLeake.mdwn	28c82ec84a77ab24e49099ceea685effa340b907
@@ -0,0 +1,10 @@
+[[!tag developer]]
+## Stephen Leake ()
+
+ * uses monotone since May 2007
+ * works on monotone since May 2007
+ * involved in automate inventory, file sutures (abandoned), conflict resolution
+ * contact: stephen_leake AT stephe-leake DOT org
+ * Homepage: http://stephe-leake.org
+
+Also Emacs DVC monotone frontend developer.
============================================================
--- wiki/Branches/nvm.automate_show_conflict.mdwn	b19462be1f0c7b2bca6eaae8a645fe1647627a8a
+++ wiki/Branches/nvm.automate_show_conflict.mdwn	4a636568d66b313e4669186e8db912042b10e5e9
@@ -3,6 +3,12 @@ Provide simple flow to resolve non-conte
 
 Provide simple flow to resolve non-content conflicts.
 
-Strategy: Add `automate show_conflicts`, to aid in determining how to resolve the conflicts. Then add options to merge to specify how to resolve the conflicts.
+Strategy: Add `automate show_conflicts`, to aid in determining how to
+resolve the conflicts. Then add options to merge to specify how to
+resolve the conflicts.
 
-Status: Just started; `automate show_conflicts` works for "file added on left and right" case. Need to add all other conflict cases.
+Status: [[status/Stalled]] 'automate show_conflicts' completed May
+2008; merged to main. Started work on file sutures, to provide true
+resolution of duplicate name conflicts. Abandoned August 2008; way too
+much work. Branch nvm.resolve_conflicts started with simpler approach
+to conflict resolution.