Option Selection on update svn. What to do ?

[mrlongshen]

Conflict discovered in 'npc/merchants/refine.txt'.
Select: (p) postpone, (df) diff-full, (e) edit,
  (mc) mine-conflict, (tc) theirs-conflict,
  (s) show all options: mc
 

can someone explain to me, what should i choose ?

because i update to latest svn. please help me ...

 

[Mumbles]

If you don't mind manually re-editing your version, make a backup copy on your computer and then choose to use "theirs" (tc).

 

[mrlongshen]

If you don't mind manually re-editing your version, make a backup copy on your computer and then choose to use "theirs" (tc).

erm. if i choose mine conflict what happen ?

 

[Mumbles]

If you choose "mine", your version will be used and the update for that file will be ignored.