HomePhabricator

Replace the conflict page with a two column version
299617337183Unpublished

Unpublished Commit · Learn More

Not On Permanent Ref: This commit is not an ancestor of any permanent ref.

Description

Replace the conflict page with a two column version

This is the first version of the two column edit conflict page. A new
class is introduced extending the EditPage to show the two column version.

Basically this version moves the editor with the conflicting change from
the bottom to the top into a column next to the editor with the version
that will be saved when the conflict is solved.

Next steps will be addressed in follow-up patches.

Most parts of the code if the original EditPage are still used to avoid
interferences with other bits of the edit page logic.

Bug: T143823
Change-Id: Ibfb2bfafa4f5837ef3a02407625c0f579527095a
Depends-On: I98df04f5445dcc87a96cde157df13786414b8c3a

Details

Provenance
WMDE-FischAuthored on Oct 28 2016, 2:26 PM
Parents
rESCC2f3306da779c: Whoops, track not trace
Branches
Unknown
Tags
Unknown
References
refs/changes/52/318552/9
ChangeId
Ibfb2bfafa4f5837ef3a02407625c0f579527095a