Sand Box:)

(p) postpone - mark the conflict to be resolved later (df) diff-full - show all changes made to merged file (e) edit - change merged file in an editor (r) resolved - accept merged version of file (mf) mine-full - accept my version of entire file (ignore their changes) (tf) theirs-full - accept their version of entire file (lose my changes) (l) launch - launch external tool to resolve conflict (h) help - show this list

Yeah, when you use >>> svn propset svn:externals xxxxxxxxx . then you relocate your external, and you wanna let other which use this external follow the move you go to that app and >>> svn propedit svn:externals . # don't forget full stop!!! that's it!, you can edit!!!

DO... svn propset svn:externals 'akismet http://plugins.svn.wordpress.org/akismet/trunk' . property 'svn:externals' set on '.' THEN .. svn ci ref from: http://beerpla.net/2009/06/20/how-to-properly-set-svn-svnexternals-property-in-svn-command-line/ http://old.nabble.com/svn:externals-example-td16552909.html

http://beerpla.net/2009/06/20/how-to-properly-set-svn-svnexternals-property-in-svn-command-line/

General todo before merge code - svn ci -m 'message' - svn log --stop-on-copy from working branch for get revision number from to - svn up from trunk - svn merge -r from:to from trunk -> if something conflict , there have some choice to 1.choose one is mine 2.choose others 3.postpone (leave conflict file there) if choose 3 : go to that file to remove unwanted line - then >> svn resolved filename - svn st for check everything allright - svn ci -m 'message' (very thank air)