wip

[talk-2018-dc18-gdr.git] / talk.txt

diff --git a/talk.txt b/talk.txt
index 08ecc34907e2d751311c9c3b729d1ee178b3d477..bcd7d03cde6219327f7c5c62fa3a31d3c467e329 100644 (file)
--- a/talk.txt
+++ b/talk.txt
@@ -303,13 +303,15 @@ fast-forwarding branch suitable for pushing to salsa or whereever.
 There is one caveat I should mention: right now, if two git-debrebase
 branches diverge, it is not trivial to merge them again.  If
 git-debrebase encounters a normal `git merge' it will stop and fail.
-I have ideas about how to do better at this, but it's not a trivial
-problem.  gbp pq handles this kind of situation by asking you to merge
-the actual patches: ie, you can end up resolving merge conflicts in
-diffs.  Most of the other tools handle this badly too.  Watch this
-space.  But, for now, avoid allowing your git-debrebase branch to
-diverge.  git-debrebase will help you with that by often spotting when
-it is about to occur.
+Sorting this out is not a trivial problem.  gbp pq sometimes handles
+this kind of situation by expecting you to merge the actual patches:
+ie, you can end up resolving merge conflicts in diffs.  The other
+tools can handle this badly too.
+
+I have ideas about how to do better at this, so watch this space.
+But, for now, avoid allowing your git-debrebase branch to diverge.
+git-debrebase will help you with that by often spotting when it is
+about to occur.
 
 ===== data model slide merge conflict failure