Le 05/11/13 21:45, Ori Livneh a écrit : > If this drives you barking mad too, fix it. Should be doable by > injecting a bit of code here: > > http://git.wikimedia.org/blob/integration%2Fzuul.git/ac3ba4fe9f9dace5673a6537ef0d3ccf5a054ac7/zuul%2Fmerger.py#L71 > > I will personally build a statue in your honor
We could surely add a feature in Zuul that would let us ignore conflicts for some files. That should be possible by defining a merge driver using the "ours" strategy and then apply that driver in /.gitattributes for the RELEASE-NOTES* files. A side effect is that the gate-and-submit jobs would work properly but Gerrit would end up refusing to submit the patchset because it cant merge it :-/ So that would merely delay the conflict resolution to post +2 which is even more annoying. -- Antoine "hashar" Musso _______________________________________________ Wikitech-l mailing list Wikitech-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikitech-l
