Daniel Kinzler has uploaded a new change for review. Change subject: (#38664) Auto-resolve edit conflicts. ......................................................................
(#38664) 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, 239 insertions(+), 115 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/86/32586/1 -- To view, visit https://gerrit.wikimedia.org/r/32586 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I344d76812649781c83814afb8e9386ff66fc9086 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Daniel Kinzler <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
