ok, tortoise use stupid words "mine" and "their" when resolving conflicted versions of files.
most of time I update MY files on server, so actually I can't figure out who the hell is "THEIR" because both server and code is MINE.
here's edited dialogue, where you can find what you need to resolve svn conflicts without breaking your brain.
(e) edit - change merged file in an editor
(df) diff-full - show all changes made to merged file
(r) resolved - accept merged version of file
(dc) display-conflict - show all conflicts (ignoring merged version)
(mc) mine-conflict - accept my version for all conflicts (same)
(tc) theirs-conflict - accept their version for all conflicts (same)
(mf) mine-full - accept my version of entire file (even non-conflicts)
(tf) theirs-full - accept their version of entire file (same)
(p) postpone - mark the conflict to be resolved later
(l) launch - launch external tool to resolve conflict
(s) show all - show this list
all cudos to nerkn
No comments:
Post a Comment