<s>
An	O
edit	B-Operating_System
conflict	I-Operating_System
is	O
a	O
computer	O
problem	O
that	O
may	O
occur	O
when	O
multiple	O
editors	O
edit	O
the	O
same	O
file	B-Operating_System
and	O
cannot	O
merge	B-General_Concept
without	O
losing	O
part	O
or	O
all	O
of	O
their	O
edit	O
.	O
</s>
<s>
The	O
conflict	O
occurs	O
when	O
an	O
editor	O
gets	O
a	O
copy	O
of	O
a	O
shared	O
document	O
file	B-Operating_System
,	O
changes	O
the	O
copy	O
,	O
and	O
attempts	O
to	O
save	O
the	O
changes	O
to	O
the	O
original	O
file	B-Operating_System
,	O
which	O
has	O
been	O
altered	O
by	O
another	O
editor	O
after	O
the	O
copy	O
was	O
obtained	O
.	O
</s>
<s>
The	O
simplest	O
way	O
to	O
resolve	O
an	O
edit	B-Operating_System
conflict	I-Operating_System
is	O
to	O
ignore	O
intervening	O
edits	O
and	O
overwrite	O
the	O
current	O
file	B-Operating_System
.	O
</s>
<s>
Manual	O
resolution	O
,	O
where	O
the	O
editor	O
determines	O
which	O
version	O
to	O
retain	O
and	O
may	O
manually	O
incorporate	O
edits	O
into	O
the	O
current	O
version	O
of	O
the	O
file	B-Operating_System
.	O
</s>
<s>
Store	O
backups	B-Protocol
or	O
file	B-Application
comparisons	I-Application
of	O
each	O
edit	O
,	O
so	O
there	O
are	O
the	O
previous	O
versions	O
of	O
the	O
file	B-Operating_System
can	O
still	O
be	O
accessed	O
once	O
the	O
original	O
is	O
overwritten	O
.	O
</s>
<s>
File	B-Application
locking	I-Application
,	O
which	O
limits	O
the	O
file	B-Operating_System
to	O
one	O
editor	O
at	O
a	O
time	O
to	O
prevent	O
edit	B-Operating_System
conflicts	I-Operating_System
.	O
</s>
<s>
Computer	O
writer	O
Gary	O
B	O
.	O
Shelly	O
notes	O
that	O
many	O
wiki	B-Protocol
systems	O
"	O
will	O
block	O
the	O
contributor	O
who	O
is	O
attempting	O
to	O
edit	O
the	O
page	O
from	O
being	O
able	O
to	O
do	O
so	O
until	O
the	O
contributor	O
currently	O
editing	O
the	O
page	O
saves	O
changes	O
or	O
remains	O
idle	O
on	O
the	O
page	O
for	O
an	O
extended	O
period	O
of	O
time.	O
"	O
</s>
<s>
Merge	B-General_Concept
,	O
by	O
determining	O
if	O
the	O
edits	O
are	O
in	O
unrelated	O
parts	O
of	O
the	O
file	B-Operating_System
and	O
combining	O
without	O
user	O
intervention	O
.	O
</s>
<s>
The	O
problem	O
is	O
encountered	O
on	O
heavily	O
edited	O
articles	O
in	O
wikis	B-Protocol
(	O
frequency	O
higher	O
in	O
articles	O
related	O
to	O
a	O
current	O
event	O
or	O
person	O
)	O
,	O
distributed	O
data	O
systems	O
(	O
e.g.	O
,	O
Google	B-Application
Sites	I-Application
)	O
,	O
and	O
revision	B-Architecture
control	I-Architecture
systems	I-Architecture
not	O
using	O
file	B-Application
locking	I-Application
,	O
as	O
well	O
as	O
other	O
high-traffic	O
pages	O
.	O
</s>
<s>
If	O
a	O
significant	O
amount	O
of	O
new	O
text	O
is	O
involved	O
,	O
the	O
editor	O
who	O
receives	O
an	O
"	O
edit	B-Operating_System
conflict	I-Operating_System
"	O
error	O
message	O
can	O
cut	B-General_Concept
and	I-General_Concept
paste	I-General_Concept
the	O
new	O
text	O
into	O
a	O
word	O
processor	O
or	O
similar	O
program	O
for	O
further	O
editing	O
,	O
or	O
can	O
paste	O
that	O
text	O
directly	O
into	O
a	O
newer	O
version	O
of	O
the	O
target	O
document	O
.	O
</s>
