Wikimedia Bugzilla is closed!

Wikimedia migrated from Bugzilla to Phabricator. Bug reports are handled in Wikimedia Phabricator.
This static website is read-only and for historical purposes. It is not possible to log in and except for displaying bug reports and their history, links might be broken. See T29166, the corresponding Phabricator task for complete and up-to-date bug report information.

Bug 27166 - Edit conflicts in InlineEditor

Summary:	Edit conflicts in InlineEditor

Status: RESOLVED WONTFIX Product: MediaWiki extensions Classification: Unclassified Component: InlineEditor (Other open bugs) Version: unspecified Hardware: All All Importance: Normal normal (vote) Target Milestone: --- Assigned To: Jan Paul Posma URL: Whiteboard: Keywords: Depends on: Blocks:   Show dependency tree / graph		Reported: 2011-02-04 20:50 UTC by Jan Paul Posma Modified: 2013-04-13 07:49 UTC (History) CC List: 0 users See Also: Web browser: --- Mobile Platform: --- Assignee Huggle Beta Tester: ---

Attachments Add an attachment (proposed patch, testcase, etc.)

Description Jan Paul Posma 2011-02-04 20:50:30 UTC Somehow, edit conflicts should be handled correctly in InlineEditor. I'm thinking about doing diff3 with preference for "Theirs", then showing a popup that this has happened, and allows the user to verify the page. The changes can be highlighted by doing a diff. Comment 1 Jan Paul Posma 2013-04-13 07:49:53 UTC InlineEditor is no longer being developed.