Meta tags:

Headings (most frequently used words):

edit, conflict, help, contents, layout, of, the, page, resolving, an, logical, conflicts, mistakes, reverting, prevention, see, also,

Text of the page (most frequently used words):
the (162), edit (74), and (65), page (59), alice (43), changes (35), #conflict (34), this (32), for (31), bob (30), wikipedia (29), editing (27), help (25), that (22), may (20), your (19), you (18), version (18), text (17), not (16), pages (14), can (14), her (14), software (13), conflicts (13), then (12), made (12), user (11), article (11), section (11), are (11), when (11), with (10), from (10), history (10), tools (10), template (10), editor (10), edits (10), one (10), same (10), was (9), other (9), new (9), box (9), how (8), editors (8), use (7), see (7), style (7), talk (7), time (7), them (7), have (7), view (6), about (6), move (6), templates (6), hide (6), wikitext (6), file (6), create (6), files (6), links (6), sections (6), what (6), only (6), merging (6), reverting (6), two (6), change (6), publish (6), before (6), both (6), case (6), improvements (6), will (6), between (6), revision (6), search (5), navigation (5), also (5), mediawiki (5), special (5), simple (5), visual (5), image (5), images (5), tables (5), technical (5), diff (5), mistakes (5), make (5), but (5), has (5), system (5), should (5), resolve (5), into (5), best (5), which (5), top (5), large (5), add (4), contents (4), mobile (4), using (4), wikimedia (4), project (4), glossary (4), scripts (4), citation (4), information (4), guide (4), irc (4), markup (4), draft (4), main (4), graphics (4), tutorial (4), link (4), users (4), access (4), articles (4), account (4), first (4), who (4), based (4), check (4), copy (4), try (4), source (4), work (4), some (4), just (4), she (4), his (4), out (4), logical (4), back (4), choose (4), current (4), shows (4), clicks (4), sidebar (4), languages (3), table (3), commons (3), edited (3), hidden (3), categories (3), index (3), category (3), shortcuts (3), common (3), html (3), bug (3), feature (3), archiving (3), lua (3), sandbox (3), syntax (3), symbols (3), upload (3), media (3), switch (3), lists (3), contributions (3), related (3), get (3), manual (3), policies (3), guidelines (3), minor (3), references (3), reference (3), versions (3), avoid (3), such (3), after (3), important (3), possible (3), paste (3), since (3), menu (3), way (3), method (3), people (3), over (3), while (3), major (3), instead (3), saving (3), they (3), someone (3), very (3), old (3), been (3), prevention (3), via (3), understand (3), summary (3), accidentally (3), small (3), sometimes (3), differences (3), pasting (3), upper (3), topic (2), toggle (2), developers (2), code (2), contact (2), privacy (2), policy (2), terms (2), apply (2), non (2), protected (2), referencing (2), bots (2), accessibility (2), script (2), set (2), browser (2), vandalism (2), gadgets (2), preferences (2), useful (2), tags (2), css (2), requests (2), portal (2), labeled (2), transclusion (2), resources (2), advanced (2), coding (2), musical (2), math (2), charts (2), barcharts (2), tutorials (2), picture (2), introduction (2), moving (2), trick (2), color (2), diffs (2), permanent (2), conditional (2), formatting (2), function (2), parser (2), beginners (2), magic (2), words (2), line (2), columns (2), cheatsheet (2), here (2), searching (2), recent (2), random (2), faq (2), admin (2), passwords (2), logging (2), visualeditor (2), levels (2), characters (2), notices (2), name (2), toolbar (2), general (2), personal (2), village (2), desk (2), teahouse (2), ask (2), tips (2), faqs (2), directories (2), url (2), wiki (2), review (2), deletion (2), find (2), consensus (2), biographies (2), started (2), day (2), rules (2), principles (2), ignore (2), all (2), simplified (2), advice (2), viewing (2), making (2), activity (2), hot (2), blue (2), button (2), post (2), still (2), open (2), need (2), down (2), any (2), being (2), more (2), once (2), long (2), simply (2), others (2), reduces (2), because (2), different (2), easier (2), previous (2), reversion (2), meantime (2), problem (2), cause (2), overwrite (2), else (2), doing (2), always (2), revert (2), would (2), earlier (2), approach (2), friendly (2), point (2), particularly (2), newcomers (2), even (2), had (2), example (2), must (2), absolutely (2), acceptable (2), aren (2), good (2), their (2), third (2), party (2), used (2), second (2), save (2), again (2), merge (2), copied (2), content (2), whole (2), whether (2), submit (2), bottom (2), like (2), resolving (2), multiple (2), hence (2), where (2), containing (2), following (2), layout (2), finishes (2), saves (2), automatically (2), reconcile (2), manually (2), sends (2), ecf (2), edc (2), community (2), appearance (2), read (2), english (2), bahasa (2), log (2), donate (2), cookie, statement, statistics, conduct, legal, safety, contacts, disclaimers, available, under, additional, site, agree, registered, trademark, profit, organization, foundation, inc, creative, attribution, sharealike, license, rendered, parsoid, last, 2026, utc, semi, items, retrieved, https, org, php, title, edit_conflict, oldid, 1354343370, metadata, accounts, further, administrators, inactive, stiki, igloo, wpcleaner, ultraviolet, twinkle, redwarn, popups, interceptor, huggle, hotcat, creating, autowikibrowser, antivandal, afc, helper, automated, beta, features, cloud, services, optimum, tool, alternative, browsing, safe, mode, techniques, list, customizing, watchlists, cleaning, skins, customisation, styles, span, validation, classes, microformats, cascading, sheets, module, timedmediahandler, extension, reports, design, description, namespaces, data, structure, infinite, parameters, scribbling, costs, benefits, job, queue, purge, substitution, test, cases, limits, documentation, modules, wikihiero, easytimeline, timeline, scores, formulas, scale, graphs, family, trees, sound, lab, improve, quality, basic, bitmap, gallery, tag, svg, extended, options, uploading, preparing, creation, usage, urls, pipe, colon, interwiki, interlanguage, colours, sortable, collapsing, basics, tocs, redirects, expressions, break, handling, watchlist, linksearch, pending, import, curation, notifications, echo, moves, logs, reset, emailing, filter, allpages, entering, editnotice, printing, multilingual, support, charinsert, keyboard, bypass, cache, pump, missing, tasks, essays, departments, abbreviations, sounds, music, elevation, calculations, protocol, cleanup, email, confirmation, redirect, renaming, linking, infoboxes, footnotes, sources, convert, numbers, cite, errors, citations, appealing, blocks, titles, leads, disambiguation, discussions, categorization, living, dos, don, live, chat, introductions, why, getting, wizard, tip, rule, etiquette, avoiding, young, contributing, students, saved, copyright, readers, writes, parental, disclaimer, purpose, administration, pumps, noticeboards, desks, visit, interactive, forum, managing, control, referenced, additionally, running, maintenance, filling, trying, substantive, high, volume, usually, subsides, urgent, wait, until, click, big, quickly, needs, relevant, part, already, changed, writing, planned, response, write, drop, closest, real, preview, sure, everything, exactly, want, than, every, minutes, death, internationally, famous, person, minimize, number, notice, its, namespace, period, discourage, put, proceeding, remove, complete, inuse, start, sandboxes, mainspace, ready, stop, hour, watch, practical, area, cope, areas, utility, triggers, attempt, few, lines, detection, paragraph, diff3, cvs, frequently, risk, experiencing, irritating, consuming, there, ways, less, frequent, recover, did, tell, prevents, true, hasn, 2006, modified, warning, triggered, unintentionally, reverted, latest, sense, without, realising, wise, performing, posting, preferably, wars, repeats, error, word, could, take, little, care, future, correct, though, experienced, occasional, reminder, circumstance, reinstate, leave, intact, something, indicate, reinstating, removed, apologize, mistake, thank, him, preserving, replaced, reverse, desire, protect, punish, carelessness, subsequently, process, human, reversed, immediately, visible, reasons, thinking, expected, amicably, assists, external, does, follow, bullet, above, equivalent, measure, causes, reported, foolproof, another, interval, retrieval, final, detected, checking, afterwards, originally, copying, lots, reorganising, adding, etc, done, thing, onto, single, these, lost, manner, either, undetectable, mechanism, decides, give, message, assume, faith, occasionally, window, however, routinely, laziness, encourage, contributors, double, merges, matters, become, complicated, simultaneously, subject, look, decide, themselves, better, option, appropriate, remerge, determine, separate, might, discussion, warn, accuracy, peer, most, situations, resolved, including, certain, times, pressing, slow, able, responds, involving, processed, yet, moment, later, carried, background, longer, combined, addition, type, result, removal, produces, oneself, press, seems, solution, outside, cancel, clipboard, interpreted, produce, duplication, unless, deletes, boxes, difference, except, full, added, going, many, scroll, contains, end, explanation, consistent, interface, depending, traditional, app, web, note, discovers, currently, published, unable, giving, chance, publishes, discusses, deal, consider, situation, occur, causing, each, happens, provides, screen, allows, nutshell, explains, concepts, processes, reflect, varying, leading, cannot, confused, warring, free, encyclopedia, wikidata, item, meta, projects, printable, download, pdf, print, export, legacy, shortened, actions, tiếng, việt, اردو, українська, ไทย, తెలుగు, தமிழ், svenska, sunda, slovenščina, slovenčina, සිංහල, scots, русский, română, português, polski, norsk, bokmål, nederlands, melayu, latviešu, lietuvių, 한국어, jawa, 日本語, italiano, íslenska, indonesia, magyar, עברית, galego, français, فارسی, eesti, español, esperanto, ελληνικά, deutsch, dansk, čeština, català, bosanski, български, العربية, ænglisc, alemannisch, afrikaans, learn, contribute, events, jump,

Text of the page (random words):
box containing bob s version of the whole page even if alice is doing section editing at the bottom of the edit conflict page is a second editing box containing the text alice was going to submit this will be alice s version of the page or section she was editing between the two editing boxes is a diff that shows the difference between bob s and alice s version of the article for the section alice is editing it shows alice s changes and bob s possible changes except for sections where alice and bob have both made the same change for the other sections it shows the full new text as if all that text was added alice can edit in the upper editing box and press publish changes in the case alice was editing only a section this will be interpreted as the new version of the section hence produce duplication of the other sections unless alice deletes them before saving this seems to be a bug the best solution in this case is to save your new text outside of wikipedia e g to the clipboard cancel out then try again at certain times when pressing publish changes and the system is slow one may be able to make multiple edits to the same page before the system responds this produces an edit conflict with oneself in this case the upper text may be the old version instead of the one involving the first edit i e the system notices the earlier change but has not processed it yet a moment later while one is viewing the edit conflict page the first change is carried out in the background and the upper text no longer is the current one hence the diff shows the combined edit and in the case of section editing like before the addition of the other sections if you choose to publish your work in this type of edit conflict it will result in the removal of your previous editing from the page resolving an edit conflict in most situations an edit conflict can be resolved by merging the two changes to a page including the contributions of both editors if alice made only small changes and bob made large changes she may choose to work from bob s version and re merge her changes in alice might choose to add some text like via edit conflict to the edit summary or use template edit conflict on a discussion talk page to warn bob and others that she had to do this bob can then peer review her merging for accuracy if alice made large changes and bob made small changes alice may choose to work from her version one option is for alice to copy the bottom text into the top text or just copy over the one section of the top text if alice was section editing with an appropriate edit summary e g via edit conflict will remerge then alice can view the page history determine bob s changes and re apply them to her version in a separate edit if both alice and bob made large changes matters become complicated and alice and bob just have to do the best they can for example if both alice and bob simultaneously add a large section of text on the same subject then it may be best for alice to submit her changes and then for alice and bob to both have a look at the two versions and decide between themselves which version is better alice should not just post her changes over the top of bob s we assume good faith mistakes are occasionally made and newcomers may not understand the edit conflict window however alice must not routinely ignore edit conflicts it is absolutely not acceptable for alice to overwrite bob out of laziness we encourage contributors to double check their merges by using the diff feature logical edit conflicts this is a conflict between editors that is undetectable by the mechanism that decides whether to give the edit conflict message some people edit by copying the source text 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 as a single new edit if someone else has made changes in the meantime these changes would get lost in the paste back people who edit in this manner should either paste only into the same edit box that was originally copied from or check the page history for such edits and merge the changes before pasting back the second method is not foolproof since another editor may save changes in the time interval between the retrieval of the page history and the final pasting back this can be detected by checking the page history again afterwards if third party software that assists a user to edit a page in an external editor does not follow the first bullet point above or the equivalent measure if any for the method it is using to access wikipedia and causes a logical edit conflict then that is a software bug which should be reported to the software developers of the third party software being used mistakes sometimes mistakes will be made in the merging process because alice is human and this may cause some of bob s changes to be accidentally reversed logical edit conflicts aren t always immediately visible sometimes alice may have good reasons for thinking that bob s improvements aren t useful in this case bob and alice are expected to resolve their differences amicably if bob made a small change which alice accidentally replaced bob must not revert to his version it is absolutely not acceptable for bob to reverse alice s major improvements to the page out of a desire to protect his minor improvements or to punish alice for her carelessness this is particularly important if the page has subsequently been edited by other editors the best approach for bob in this circumstance is to edit alice s version reinstate his minor improvements and leave alice s major improvements intact he may also add something to the edit summary to indicate that he had to do this for example reinstating link which alice accidentally removed alice should then apologize to bob for her mistake and thank him for preserving her improvements if alice repeats her error then the best approach is for bob to have a friendly word on her talk page point her to this page and ask her if she could take a little more care in the 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 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 reverting 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 diff after performing a revert just as you would after posting via edit conflict preferably one can simply try to avoid reversion wars prevention did someone tell you that section editing prevents edit conflicts that was true in very old versions of mediawiki software but it hasn t been the case since about 2006 edit conflicts are irritating and can be time consuming but there are ways to make them less frequent or easier to recover from saving your work frequently reduces the risk of your experiencing an edit conflict and when you do they should be easier to resolve when practical edit one area of the article at a time this reduces edit conflicts because the system can cope if different editors are editing different areas at the same time both the source code editor and the visual editor use cvs style edit conflict merging based on the diff3 utility this feature triggers an edit conflict only if users attempt to edit the same few lines edit conflict detection is by line paragraph start new articles in sandboxes and move them to mainspace only when you are ready to stop editing them for an hour or so and instead watch what others do to them wikipedia has an in use notice in its template namespace that people may use when editing a page over a long period of time this may discourage other editors from editing while you are editing simply put inuse on an article before proceeding with a major edit and remove the template when the editing is complete for hot articles any article that is being edited more than about once every two minutes e g the death of an internationally famous person try this method to minimize the number of edit conflicts draft your change in a sandbox before you open the real article for editing preview it and make sure that everything is exactly the way you want it to be copy the wikitext from your draft if you write in the visual editor then switch to the wikitext editor it s in the drop down menu closest to the blue publish changes button check the history page to see what has already changed since you started writing your sandbox draft do you need to change your planned edit in response if your edit still needs to be made then open the relevant part of the article and paste in your wikitext click the big blue button to post your changes as quickly as possible additionally avoid running simple maintenance scripts on hot articles script based edits such as filling in reference templates can create edit conflicts for editors who are trying to make substantive changes high volume activity usually subsides after a day or two and edits such as reference formatting that are important but not urgent can wait until then see also this page is referenced in the wikipedia glossary template edit conflict version control the activity of managing versions of files v t e wikipedia help pages visit the teahouse or the help desk for an interactive q a forum faqs reference desks noticeboards cheatsheet directories village pumps about wikipedia administration purpose principles policies and guidelines what wikipedia is not disclaimer parental advice making requests who writes wikipedia help for readers faq copyright glossary mobile access navigation other languages saved pages searching students viewing media contributing to wikipedia advice for young editors avoiding common mistakes etiquette simplified manual of style simplified rule set ignore all rules the rules are principles style tips tip of the day your first article article wizard getting started why create an account introductions by topic graphics tutorials picture tutorial irc live chat tutorial visualeditor user guide dos and don ts accessibility biographies biographies living categorization consensus discussions disambiguation images leads links lists references tables titles of articles how to pages and information pages appealing blocks article deletion categories citations references referencing for beginners citation style 1 cite errors references and page numbers convert diff editing minor edit toolbar edit conflict find sources files footnotes image deletion infoboxes linking link color logging in merging new page review page name renaming pages redirect passwords email confirmation reverting simple vandalism cleanup talk pages archiving simple archiving user contributions wp search protocol coding wiki markup barcharts calculations characters columns elevation hidden text html lists magic words music symbols sections sounds tables templates transclusion url visual files directories abbreviations ai departments editor s index essays faqs glossary guidelines manual of style policies tasks tips tools missing manual ask for help on your talk page v t e wikipedia technical help get personal technical help at the teahouse help desk village pump technical talk pages or irc general technical help bypass cache keyboard shortcuts editing charinsert edit conflict edit toolbar reverting how to create a page irc tutorial mobile access multilingual support page history page information page name help printing software notices editnotice special characters entering user access levels visualeditor help special page related special page help allpages edit filter emailing users logging in reset passwords logs moving a page history merging non admin and admin only page moves notifications echo faq page curation page import pending changes random pages recent changes related changes searching linksearch tags user contributions watchlist what links here wikitext wikitext cheatsheet columns line break handling lists magic words for beginners conditional expressions switch parser function time function redirects sections and tocs tables introduction basics advanced table formatting collapsing conditional tables sortable tables using colours links and diffs links interlanguage interwiki permanent diffs colon trick link color pipe trick urls media files media help files creation and usage moving files to commons images introduction to images picture tutorial preparing images for upload uploading images options to hide an image extended image syntax svg help gallery tag graphics tutorials basic bitmap image editing how to improve image quality graphics lab resources sound file markup visual file markup other graphics family trees graphs and charts how to create barcharts to scale charts math formulas math symbols musical scores musical symbols timeline easytimeline syntax wikihiero syntax templates and lua modules templates advanced template coding template documentation template index template limits template sandbox and test cases citation templates lua help lua project resources to do substitution purge job queue transclusion labeled section costs and benefits guide to scribbling infinite parameters data structure namespaces main article category draft file file description page help portal project wikipedia talk archiving simple template user user page design mediawiki bug reports and feature requests timedmediahandler extension module special html and css cascading style sheets html in wikitext common js and common css classes in microformats markup validation span tags useful styles customisation and tools preferences gadgets skins citation tools cleaning up vandalism tools customizing watchlists hide pages irc scripts user scripts guide list techniques safe mode user style tools alternative browsing browser tools editing tools navigation shortcuts optimum tool set wikimedia cloud services beta features at mediawiki automated editing afc helper script antivandal autowikibrowser bots creating history hotcat huggle interceptor navigation popups redwarn twinkle ultraviolet wpcleaner inactive igloo stiki see also category wikipedia how to category wikipedia information pages further navigation at help pages administrators accessibility accounts bots referencing citation metadata templates user scripts retrieved from https en wikipedia org w index php title help edit_conflict oldid 1354343370 categories wikipedia how to wikipedia glossary items wikipedia help hidden categories wikipedia semi protected project pages wikipedia move protected project page...