Aus SubmersWiki

If User 2 only made small changes, and User 1 made large changes, he may choose to work from User 1's version, and re-merge his changes in. User 2 might choose to add some text like "via edit conflict" to warn User 1 and others that he had to do this - User 1 can then peer review his merging for accuracy.

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

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

User 2 should not just post his changes over the top of User 1's. We assume good faith - mistakes are occasionally made, and newcomers may not understand the edit conflict window. However, User 2 must not routinely ignore edit conflicts. It is absolutely not acceptable for User 2 to overwrite User 1 out of laziness. We encourage contributors to double-check their merges by using the diff feature.