Help:Paragraph-based Edit Conflict Interface/zh



双栏编辑冲突视图是解决页面编辑冲突的新界面. 它显示成对的文本段落，使您可以更轻松地将文本与当前在线的文本合并. 這不在討論頁上運作.

第一版于2017年2月至5月作为测试功能提供，于2018年11月8日更换为新的测试功能.

背景
双栏编辑冲突视图旨在实现德语维基社区的技术愿望清单，并由WMDE的技术团队开发. 更多的信息可以在Meta的主项目页面找到.

用法
启用新视图： 要启用该功能，您必须先登录并勾选测试功能参数设置页面上的“双栏编辑冲突”功能的复选框. 如果您已經啟用了第一個測試功能，則將自動獲得新外觀.

简而言之
The edit conflict interface wants to help you merge your text with the one that’s currently online. It breaks down the differences between the two text versions visually:


 * Text passages that differ are displayed in pairs next to each other: The current version of the page is shown in yellow and your version in blue. Inside, text that was changed is highlighted.
 * Text passages that are identical in both versions are displayed as a grey bar, spanning the whole width.

How to solve an edit conflict


 * 1) For each pair of text, select the version you want to keep.
 * 2) Edit the selected text, if needed.
 * 3) Click Publish changes. A new page version is created, combining all of the text you selected and the grey boxes.

Step by step
1. Get oriented.

A tutorial guides you through the interface the first time you encounter an edit conflict. You can open it again by clicking on the help icon (?).

In order to help you solve the edit conflict, the interface breaks down the differences between the two revisions like this:


 * Text passages that differ are displayed in pairs next to each other: The current version of the page is shown in yellow and your version in blue. Inside, text that was changed is highlighted.
 * Text passages that are identical in both versions are displayed as a grey bar, spanning the whole width.

2. Build a new version by merging your text with the one that’s currently online.


 * Select the passages you want to keep by clicking on the radio buttons next to them. By default, all texts from the other person are selected, so if you publish immediately, none of your text changes are saved.
 * Edit passages, if needed.
 * Click on the black pencil to open the editing mode for a text passage. If the pencil is grey, it means you need to select the text passage first. Otherwise, this version won’t be saved when you click publish.
 * You can also edit text passages that are identical in both versions.
 * The highlights that indicate the differences between the versions disappear when you edit a text passage.
 * You can integrate parts from other text passages by copy and paste, either with the copy and paste function on your keyboard or with a right click.
 * Click on the check mark to apply changes to a text box and to close its editing mode.
 * If you want to discard your changes and reset the contents of the text box to what it was when the edit conflict occurred, click on the back arrow. This also restores the highlighting.

3. Publish a new page version.

When you’re done selecting and editing all of the passages, click “Publish changes”. This composes all of the text passages you selected and the grey boxes into a new page revision. As on all wiki pages, you can preview the changes first via the Preview button. On clicking Cancel, you return to the current version of the page.

Non-JS version
If you’re not using JavaScript, the look or behavior of the feature will be as follows:


 * All text passages are shown in editor boxes.
 * There are no buttons within the editor boxes.
 * Text passages that are identical in both versions are always expanded.

部署路线图
第一個测试功能：
 * MediaWiki.org: 2017-02-06 ✅
 * Meta: 2017-02-13 ✅
 * Dewiki: 2017-02-14 ✅
 * Arwiki: 2017-02-21 ✅
 * Hewiki: 2017-02-23 ✅
 * Fiwiki: 2017-04-12 ✅
 * 在所有其他wiki上： 2017-05-10 ✅

New beta feature:
 * The switch from the first to the new beta feature on all wikis: 2018-11-08 ✅

Default feature on:
 * Dewiki: March 25, 2020 ✅
 * Arwiki: March 25, 2020 ✅
 * Fawiki: March 25, 2020 ✅

帮助翻译
此功能的软件消息可在翻译wiki上翻译. 我们欢迎各种形式的帮助！