檢視使用說明:編輯沖突的原始碼

考慮這樣的情況：

* 黃蓉 在一個頁面上點擊了「編輯本頁」。
* 楊過 在同樣的頁面上也點擊了「編輯本頁」。
* 黃蓉 完成了他的修改，並單擊「保存本頁」。這個頁面用 黃蓉 的版本保存。
* 楊過 也完成了他的修改，並單擊「保存本頁」。這時 楊過 看到了「編輯沖突」頁面。
這種情況在本頁中討論。

== 編輯沖突頁面的大致版面 ==

在頁面的最頂部是'''黃蓉編輯的版本'''。

在頁面的最下方是楊過打算提交的文字，如果楊過編輯的是整個頁面，其所提交的文字就會成為'''楊過編輯的版本'''，或者，如果楊過編輯的是''一小節''，那麼其所提交的文字就會成為'''楊過編輯的''一小節''的版本'''。

在頁面的中間是兩段文字的不同處的比較，但如果楊過只編輯了''一小節''，這些比較就不怎麼有用了。

<!--
=== 英文原文 ===
(Layout of the edit conflict page)

At the top is 黃蓉's version of the page.

At the bottom is the text 楊過 was going to submit. This will be 楊過's version of the page, if he edited the entire page, or 楊過's version of the section he edited, if he was editing just one section.

In the middle is a diff of the two pieces of text. This is much less useful if 楊過 used section editing.

-->

== 如何解決編輯沖突 ==

如果楊過只做了一些小修改，而黃蓉做出大的修改，楊過可以選擇在黃蓉已經編輯過的版本上進行編輯，然後把自己的修改文字再合並進去。楊過可能增加一些文字諸如「因編輯沖突修改過」去提醒黃蓉和其他人，說明他不得不這麼做——然後，黃蓉就可以回顧楊過合並的那些東東。

如果楊過作出了大量的修改，而黃蓉只修改了一些小東東，楊過可以繼續在自己的版本中修改。作為可選的，楊過還可以把頁面最底部的文字複制到頂部(如果楊過只編輯了'''一節'''，那麼只複制那'''一節'''即可)，最好再加上一個適當的[[Help:編輯摘要|編輯摘要]](如「因編輯沖突修改過，將被合並」)。這樣，楊過可以在歷史頁面中查看頁面黃蓉的修改，再把黃蓉修改過的東東合並到他的版本。

如果楊過和黃蓉都進行了大量修改，問題就有點複雜了，楊過和黃蓉只能盡他們的最大努力做得更好。比如說，如果楊過和黃蓉同時對同一主題增加了一大段自己的文字，那麼，楊過和黃蓉最好是都先提交自己所作出的修改，然後再看看比較比較兩個版本，然後兩個一起決定究竟哪個版本更好。

楊過不應該只把自己的修改提交後就不管了。在這里，我們假設大家都是好心的——但錯誤有時候是難免的，並且新來者可能不明白這種編輯沖突的版面。然而，楊過不能每次都忽略這種編輯沖突。如果楊過因為懶得管而把黃蓉所作出的修改的版本覆蓋，這樣做是絕對是令人不能接受的。我們鼓勵各位做貢獻的維基人使用'''比較不同點'''功能多多檢查一下他們所做出的合並。

<!--
(Resolving an edit conflict)
=== 英文原文 ===
If 楊過 only made small changes, and 黃蓉 made large changes, he may choose to work from 黃蓉's version, and re-merge his changes in. 楊過 might choose to add some text like "via edit conflict" to warn 黃蓉 and others that he had to do this - 黃蓉 can then [[Meatball:PeerReview|peer review]] his merging for accuracy.

If 楊過 made large changes, and 黃蓉 made small changes, he may choose to work from his version. One option is for 楊過 to copy the bottom text into the top text (or just copy over the one section of the top text, if 楊過 was section editing), with an appropriate [[wikipedia:edit summary|edit summary]] (eg "via edit conflict, will remerge"). Then 楊過 can view the page history, determine 黃蓉's changes, and re-apply them to his version, in a separate edit.

If both 黃蓉 and 楊過 made large changes, matters become complicated, and 黃蓉 and 楊過 just have to do the best they can. For example, if both 黃蓉 and 楊過 simultaneously add a large section of text on the same subject, then it may be best for 楊過 to submit his changes, and then for 黃蓉 and 楊過 to both have a look at the two versions and decide between themselves which version is better.

楊過 should not just post his changes over the top of 黃蓉's. We [[Meatball:AssumeGoodFaith|assume good faith]] here - mistakes are occasionally made, and [[wikipedia:Welcome, newcomers|newcomers]] may not understand the edit conflict window. However, 楊過 ''must not'' routinely ignore edit conflicts. It is absolutely not acceptable for 楊過 to overwrite 黃蓉 out of laziness. We encourage contributors to double-check their merges by using the [[Help:Diff|diff]] feature.

-->

== 不容易發現的編輯沖突 ==
還有一種無法被當前wiki程序檢查到的編輯沖突，因此系統也無法發送「編輯沖突」的消息。


有些人喜歡這樣編輯：
# 先把原文複制並粘貼到其他的文本編輯器中進行修改
# 對原文進行了很多更改（對文章結構進行重新組織、添加了新的內容等）。
# 然後，在他完成編輯之後，將整篇文章一次性粘貼回本網站的編輯窗口。

如果在此之間有人對這篇文章進行了小修改，那麼在粘貼回之前，這些小修改將會丟失。因此，以拷貝到其他文本編輯器中進行修改的方式來編輯文章的用戶，應該在保存後檢查兩個版本之間的不同，並且進行必要的合並。

<!--
=== 英文原文 ===
Logical edit conflicts
(This is a conflict between editors that is undetectable by the mechanism that decides whether to give the "edit conflict" message.)<br>
Some people edit by 
* copying the source text from one edit page into a text editor, 
* making lots of changes (reorganising, adding new content, etc...), 
* and then, when they're done, pasting the whole thing back onto Wikipedia (via a new edit page) as a single edit. 
If someone else has made minor changes prior to that step of pasting back, these changes will get lost in the paste-back. People who edit in this manner should check the diff on their edit to make sure they didn't inadvertently blast over the top of someone else's changes.

-->
== 不小心造成的錯誤 ==
有時候在合並不同版本文章的過程中會發生錯誤。因為楊過只是個人，不可能像程序一樣進行精確的檢查，這樣就可能導致黃蓉所作出的修改被意外的丟失。那種不容易發現的編輯沖突也不會立即可以看到。也有可能有時候楊過會有充分的理由覺得黃蓉的修改不是很有用，在這種情況下，我們期望黃蓉和楊過能友好地解決他們之間的不同意見。

如果黃蓉只作出小修改，而被楊過意外地弄丟了，那麽黃蓉不能「恢複(或者說回退)」到她的版本。如果黃蓉將楊過所作出的很大的修改的頁面回退到她自己的小修改的版本，以此來作為對自己的肯定或者對楊過粗心的懲罰，這是絕對讓人無法接受的。尤其是這個頁面又已經被其他人，如張三或李四已經又修改過。

對黃蓉來說，這種情況下最好的辦法是在楊過的版本上進行編輯，將她自己的小修改再加進去，然後保持楊過所作的大的改動。如果可能的話，她也可以加上一些編輯摘要說明她不得不這麼做——例如：「重新恢複被楊過搞丟了的文字」等。對楊過而言，他應當為自己的疏忽向黃蓉道歉，並且感謝黃蓉主動恢複她自己改動。

但是，如果楊過經常出現這樣的錯誤，對黃蓉來說，較好的解決辦法是在楊過的「討論頁」面中友好地留言，告訴楊過那些頁面，並且友好地詢問楊過能否在以後的編輯中稍微留意一下。這對根本不了解適當的方法以解決編輯沖突的新手來說尤其重要，更不用說即使是那些老手也希望別人善意地提醒自己。


<!--
== Mistakes ==

Sometimes mistakes will be made in the merging process, because 楊過 is human, and this may cause some of 黃蓉's changes to be accidentally reversed. Logical edit conflicts aren't always immediately visible. Sometimes 楊過 may have good reasons for thinking that 黃蓉's improvements aren't useful. In these case, 黃蓉 and 楊過 are expected to resolve their differences amicably.

If 黃蓉 made a small change, which 楊過 accidentally reversed, then 黃蓉 ''must not'' [[wikipedia:revert|revert]] to her version. It is absolutely not acceptable for 黃蓉 to reverse 楊過's major improvements to the page out of a desire to protect her minor improvements, or to punish 楊過 for his carelessness. This is particularly important if the page has subsequently been edited by, say, Sarah and Jonathan.

The best approach for 黃蓉 in this circumstance is for 黃蓉 to edit 楊過's version, reinstate her minor improvements, and leave 楊過's major improvements intact. She may also add something to the edit summary to indicate that she had to do this - for example: "Reinstating link which 楊過 accidentally removed". 楊過 should then apologise to 黃蓉 for his mistake, and thank her for reinstating her improvement.

If 楊過 repeats his error, then the best approach is for 黃蓉 to have a friendly word on his talk page, point him to this page, and ask him if he could take a little more care in future. This is particularly important for newcomers, who may not understand the correct way to resolve edit conflicts, though even experienced users may need the occasional friendly reminder.

See also: [[Wikipedia:Wikiquette|Wikiquette]], [[Wikipedia:WikiLove|WikiLove]].

-->

== 回退時候的沖突 ==

當保存一個先前的版本（亦即當回退的時候），或者在發生編輯沖突警告時，對被編輯過的版本的新的改動進行保存，以及在此期間可能又有新的非故意的回退作出的改動，這一切都可能出現編輯沖突。為了避免這種問題，可以從早先版本的編輯框中複制文本到最新的版本中。在某些意義上，這樣又可能導致隱藏的編輯沖突：你可能沒有意識到你現在所作的會覆蓋其他人的更改。較為明智的做法是每次回退以後都對不同版本進行比較，就象系統提醒你有編輯沖突一下。最好是大家都盡量避免'''編輯戰'''。

<!--
==Reverting==

When saving a previous version (i.e. when reverting) or a new version based on that (a modified reversion) the edit conflict warning and prevention system is not triggered and a possible new edit made in the meantime is unintentionally reverted also, see [[Wikipedia:How to revert a page to an earlier version]]. To avoid this problem one can copy the text from the edit box of the old version into the edit box of the latest version. In some sense, this can cause ''hidden edit conflicts'': you may overwrite someone else's changes without realising that you are doing so. It's always wise to check the [[m:Help:Diff|diff]] after performing a revert, just as you would after posting via edit conflict. Preferably, one can simply try to avoid reversion wars.

-->
== 如何預防 ==

因為編輯沖突既惱人又費時，因此你可能改變你的編輯習慣——編輯那些不常被編輯的頁面：致力於那些最近一直沒有被編輯的頁面，比如說那些在[[Special:Ancientpages|最老頁面]]中列出的頁面。

另外一種'''預防'''編輯沖突的意思是指，一次性作大的修改而不是經常小小地修改一些頁面：如果經常對頁面進行小修改，你很容易遇到編輯沖突。

適當的使用<nowiki>{{Inuse}}</nowiki>的模板布告也會有幫助。

<!--
== Prevention ==

Because edit conflicts are irritating and time-consuming, you may choose to alter your editing habits to render them less frequent: aiming to make more edits to pages that have not been edited recently, such as those listed on [[Special:Ancientpages|ancient pages]], for example.

Another means of avoiding edit conflicts is to make a single larger change, rather than frequent smaller changes: this makes it more likely that you will get an edit conflict, but less likely that you will cause others to get an edit conflict. Using the "[[Wikipedia:Show preview|Show preview]]" button helps here.

Appropriate use of the [[Template:Inuse]] notice can help too.


In the long term, some form of [[Meatball:MergingAutomatically|automatic merge]] may be added to the WikiMedia software.

-->

== 參見 ==
*[[Template:Inuse]] - ''Inuse模板的使用''

[[Category:幫助文檔|BJCT]]