jenkins-bot has submitted this change and it was merged.

Change subject: pywikibot.DataSite.mergeItem ignore_conflicts is str ......................................................................

pywikibot.DataSite.mergeItem ignore_conflicts is str

As documented in https://phabricator.wikimedia.org/diffusion/EWBA/browse/master/repo/includes..., the ignore_conflicts parameter is a list of strings, not a bool.

Bug: T138289 Change-Id: Ia759640891a564699553ad334a9b3b0005814b82 --- M pywikibot/site.py 1 file changed, 5 insertions(+), 3 deletions(-)

Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified

diff --git a/pywikibot/site.py b/pywikibot/site.py index 4b7969b..a147460 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -7371,7 +7371,7 @@

@must_be(group='user') @deprecated_args(ignoreconflicts='ignore_conflicts') - def mergeItems(self, fromItem, toItem, ignore_conflicts=False, + def mergeItems(self, fromItem, toItem, ignore_conflicts=None, summary=None, bot=True): """ Merge two items together. @@ -7380,8 +7380,10 @@ @type fromItem: pywikibot.ItemPage @param toItem: Item to merge into @type toItem: pywikibot.ItemPage - @param ignore_conflicts: Whether to ignore conflicts - @type ignore_conflicts: bool + @param ignore_conflicts: Which type of conflicts + ('description', 'sitelink', and 'statement') + should be ignored + @type ignore_conflicts: list of str @param summary: Edit summary @type summary: str @param bot: Whether to mark the edit as a bot edit