Hi folks,
was there any setting changes for gerrit few weeks ago. I feel since few weeks a lot of merge conflicts are indicated at gerrit but when rebasing there aren't any conflicts.
Best
xqt
Hi, I too have noticed this issue. In order to fix it I went to project options[1] and changed the value of "Allow content merges" from the default "INHERIT (false)" to "TRUE". After that the red "Cannot merge" status of some of the open changes disappeared. However on the dashboard,[1] they still have a Merge Conflict status. Probably a rebase will resolve that.
[1]: https://gerrit.wikimedia.org/r/#/admin/projects/pywikibot/core [2]: https://gerrit.wikimedia.org/r/#/projects/pywikibot/core,dashboards/default:...
On Mon, Mar 19, 2018 at 1:56 AM, info@gno.de wrote:
Hi folks,
was there any setting changes for gerrit few weeks ago. I feel since few weeks a lot of merge conflicts are indicated at gerrit but when rebasing there aren't any conflicts.
Best
xqt
pywikibot mailing list pywikibot@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/pywikibot
The dashboard's status column also got updated automatically (with a few minutes delay).
On Fri, Mar 23, 2018 at 7:57 PM, Dalba dalba.wiki@gmail.com wrote:
However on the dashboard,[1] they still have a Merge Conflict status. Probably a rebase will resolve that.