gerrit settings - pywikibot - lists.wikimedia.org

List overview All Threads
Download

gerrit settings

archivebot.py: make the script...

Ordered list of disambiguation...

info＠gno.de

18 Mar 2018 18 Mar '18

9:26 p.m.

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

Attachments:

attachment.htm (text/html — 322 bytes)

Reply

Show replies by date

Dalba

23 Mar 23 Mar

3:27 p.m.

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(a)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(a)lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/pywikibot

Reply

Dalba

3:37 p.m.

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(a)gmail.com> wrote:

However on the dashboard,[1] they still have a Merge Conflict status. Probably a rebase will resolve that.

Reply

2232

days inactive

2237

days old

pywikibot@lists.wikimedia.org

Manage subscription

2 comments

2 participants

tags (0)

participants (2)

Dalba
info＠gno.de