HomePhabricator

Fix harmless edits turning into conflicts
1057c93ba400Unpublished

Unpublished Commit · Learn More

Not On Permanent Ref: This commit is not an ancestor of any permanent ref.
This commit no longer exists in the repository. It may have been part of a branch which was deleted.This commit has been deleted in the repository: it is no longer reachable from any branch, tag, or ref.

Description

Fix harmless edits turning into conflicts

The idea is as follows: It only makes sense to stick to our conflict
resolution view when the previous POST action was done from a conflict
resolution screen. We can detect this via multiple POST parameters. I
decided to use only one. Note the same is already used a few lines above.

SWAT! This must be backported now. :-(

Bug: T205942
Bug: T208840
Bug: T209012
Change-Id: Iffec3b1e69b575eb62dc839828af449170188429

Details

Provenance
thiemowmdeAuthored on Nov 7 2018, 3:27 PM
ChangeId
Iffec3b1e69b575eb62dc839828af449170188429

Commit No Longer Exists

This commit no longer exists in the repository.