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