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 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 tools can 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