29. September 2023 15:52, "Daniel Gröber" dxld@darkboxed.org schrieb:
My patches all depend on one another, Gerrit seems to treat this as "conflict" when this is entirely normal so I don't see how I can do what you suggest.
I (used to) frequently rebase against master to make sure actual conflicts don't stay there for long FYI.
I push these using HEAD:refs/for/main as was documented last time I checked (3y ago) not sure what else is expected of me.
That's the normal flow, yes. The merge conflict messages appear because we use a cherry-pick strategy, so every change _could_ be applied to HEAD directly (even if that's not normally done in patch trains like yours) - as such it makes sense to do the merge conflict detection the same way, too.
So: nothing else to do here.
All the best, Patrick