Change Details

When a user does nothing but adding or removing a linebreak, and that's part of a conflict, we need to show this conflicting piece of the page somehow, as we are showing everything else. The problem is: This piece of the page does not contain any visible content, only one or more linebreaks. And our conflict resolution interface is written in a way that it hides newlines, and tracks them in hidden fields. It's correct to present two sides for the user to pick from. One side contains more or less linebreaks than the other. But the user can't see this, just 2 empty boxes. We need some design decision for this. A trivial idea is to replace the two empty boxes with messages that say something like "here is 1 empty line" and "here are 2 empty lines" to pick from.

When a user does nothing but adding or removing a linebreak, and that's part of a conflict, we need to show this conflicting piece of the page somehow, as we are showing everything else. The problem is: This piece of the page does not contain visible content, only one or more linebreaks. And our conflict resolution interface is written in a way that it hides newlines, and tracks them in hidden fields. It's correct to present two "empty boxes" for the user to pick from. One side contains more or less linebreaks than the other. These are two actual changes that actually conflict, and the user must pick one. However: * The yellow/blue visualization of linebreaks is hard to see. (Note: https://gerrit.wikimedia.org/r/589088 already heavily improved this. Before, it was possible to see entirely empty boxes.) * When editing such a block, there is nothing, and it's impossible for the user to change the number of linebreaks. This is by design. A trivial solution might be to disable editing for newline-only blocks. We need some design decision for this. A trivial idea is to replace the two boxes with messages that say something like "here is 1 empty line" and "here are 2 empty lines" to pick from.

When a user does nothing but adding or removing a linebreak, and that's part of a conflict, we need to show this conflicting piece of the page somehow, as we are showing everything else. The problem is: This piece of the page does not contain any visible content, only one or more linebreaks. And our conflict resolution interface is written in a way that it hides newlines, and tracks them in hidden fields. It's correct to present two sides"empty boxes" for the user to pick from. One side contains more or less linebreaks than the other. These are two actual changes that actually conflict, and the user must pick one. However: * The yellow/blue visualization of linebreaks is hard to see. (Note: https://gerrit.wikimedia.org/r/589088 already heavily improved this. Before, it was possible to see entirely empty boxes.) * When editing such a block, there is nothing, and it's impossible for the user to change the number of linebreaks. But the user can't see this,This is by design. just 2 empty boxesA trivial solution might be to disable editing for newline-only blocks. We need some design decision for this. A trivial idea is to replace the two empty boxes with messages that say something like "here is 1 empty line" and "here are 2 empty lines" to pick from.