From: Ian Jackson Date: Fri, 27 Jul 2018 10:20:43 +0000 (+0100) Subject: wip X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=a0ec0452e11d3f2064e48fa50b85646dee68a97a;p=talk-2018-dc18-gdr.git wip --- diff --git a/talk.txt b/talk.txt index 08ecc34..18d06e1 100644 --- a/talk.txt +++ b/talk.txt @@ -304,9 +304,9 @@ 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 +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.