2009
07.31
07.31
I always find blogging what i find out is a good idea, we sometimes get conflicts with our subversion repository so here is a list of commands to deal with the conflict in a way that best suits you.
(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
Very interesting and amusing subject. I read with great pleasure.
Are you a professional journalist? You write very well.
Im afraid im not my friend, I run my own web design company and I like to do a bit of writing / reporting here and there.
I added your blog to bookmarks. And i’ll read your articles more often!