On Thu, Oct 15, 2020 at 11:54 AM Radoslaw Szwajkowski <rszwajko@redhat.com> wrote:
On Thu, Oct 15, 2020 at 10:21 AM Yedidyah Bar David <didi@redhat.com> wrote:
NP. Next time, better make up your mind, decide which patch should go first, and rebase the other on top of it.
That works if we have conflicts between patches authored by one person (suffering a mild dementia:P) It seems to me that we need a global automated solution to prevent this happening between patches authored by different persons. Perhaps some auto-rebase and ci test on gerrit?
This subject comes up once every year or two... And we change something, then usually things start breaking, so we refine... I think the current status is ok. Please note that https://jenkins.ovirt.org/job/ovirt-engine_standard-on-merge/1581/ did fail and left a comment in gerrit on your change. We should simply all pay a bit more attention to the result of standard-on-merge. If it fails, handle - fix or revert. Best regards, -- Didi