John Erling Blad has submitted this change and it was merged. Change subject: (Bug 39836) Auto-resolve edit conflicts. ......................................................................
(Bug 39836) Auto-resolve edit conflicts. This implements automatic resolution of merge conflicts. Not that this makes it necessary to apply atomic edits always on top of the designated base revision, so a valid patch can later be generated against the base revision and replayed on top of the latest revsions (in git terms, this is a rebase). Change-Id: I344d76812649781c83814afb8e9386ff66fc9086 --- M repo/Wikibase.i18n.php M repo/includes/EditEntity.php M repo/includes/actions/EditEntityAction.php M repo/includes/api/Api.php M repo/includes/api/ApiCreateClaim.php M repo/includes/api/ApiModifyEntity.php M repo/includes/content/ItemHandler.php M repo/includes/specials/SpecialSetLabel.php M repo/tests/phpunit/includes/EditEntityTest.php 9 files changed, 214 insertions(+), 116 deletions(-) Approvals: John Erling Blad: Verified; Looks good to me, approved Objections: Tobias Gritschacher: There's a problem with this change, please improve -- To view, visit https://gerrit.wikimedia.org/r/32586 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I344d76812649781c83814afb8e9386ff66fc9086 Gerrit-PatchSet: 4 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Daniel Kinzler <daniel.kinz...@wikimedia.de> Gerrit-Reviewer: Aude <aude.w...@gmail.com> Gerrit-Reviewer: Daniel Kinzler <daniel.kinz...@wikimedia.de> Gerrit-Reviewer: Jeroen De Dauw <jeroended...@gmail.com> Gerrit-Reviewer: John Erling Blad <john.b...@wikimedia.de> Gerrit-Reviewer: Tobias Gritschacher <tobias.gritschac...@wikimedia.de> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
