On Tue, Jun 19, 2018 at 1:48 PM Derrick Stolee <stolee@xxxxxxxxx> wrote: > Personally, > I find it difficult to base a patch off of multiple in-progress branches > and would rather work off of a "known good" point like the tip of master. You should always base your patches on 'master' (or even 'maint' if it's bug fixes that have a chance of entering 'maint'). We all we face conflicts at some point (mostly when we rebase after something gets merged to master; or things are merged on 'pu'). But git-rerere should keep conflict resolution easy (most of the time). I also expect Junio to kick and scream when patch series conflict badly on 'pu' and he will decide which one goes first and kick others out temporarily. -- Duy
