X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=NOTES.git-debrebase;h=a8e16aff41eda9230a57f76f9f39471fdf3acf28;hb=b2961d4e30d201c4a22e7a8659696a7dcb2e2e81;hp=2f2b1e8c2413811f6713401c23eedad4c82ff44f;hpb=d980524cd66e12eda58f9df6bc8410454febd3aa;p=dgit.git

diff --git a/NOTES.git-debrebase b/NOTES.git-debrebase
index 2f2b1e8c..a8e16aff 100644
--- a/NOTES.git-debrebase
+++ b/NOTES.git-debrebase
@@ -5,6 +5,7 @@ TODO
       git-debrebase(1)   command line
    tutorial
       dgit-maint-debrebase(7)
+      someone should set branch.<name>.mergeOptions to include --ff-only ?
 
    clean up remains of NOTES and README
 
@@ -274,3 +275,43 @@ ideally, would make pseudomerge over dgit view
 would need to check that dgit view is actually dgit view of
   ond of our ancestors
 failing that first push will need --overwrite
+
+========================================
+
+divergence, merges:
+
+same problem
+ if merge, look at branches before merge
+ generate new combined branch
+ pseudomerge to overwrite merge
+
+current avaiable strategies:
+
+ maybe launder foreign branch
+
+ if foreign branch is nmuish, can rebase it onto ours
+
+ could merge breakwaters (use analyse to find them)
+ merge breakwaters (assuming same upstream)
+ manually construct new patch queue by inspection of
+  the other two patch queues
+
+ instead of manually constructing patch queue, could use
+  gbp pq export and git merge the patch queues
+  (ie work with interdiffs)
+
+ if upstreams are different and one is ahead
+  simply treat that as "ours" and
+  do the work to import changes from the other
+
+ if upstreams have diverged, can
+  resolve somehow to make new upstream
+  do new-upstream on each branch separately
+  now reduced to previously "solved" problem
+
+ in future, auto patch queue merge algorithm
+  determine next patch to apply
+  there are three versions o..O, l..L, r..R
+  we have already constructed m (previous patch or merged breakwater)
+  try using vector calculus in the implied cube and compute
+   multiple ways to check consistency ?