SVN Something to do when CONFLICT appear. 

  (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

Comments

Post a Comment

Popular posts from this blog

Difference between apt-get update and apt-get dis-upgrade

The “sudo apt-get upgrade” isn’t necessary. It’s a different type of upgrade from “dist-upgrade” You either run one or the other. “apt-get upgrade” will only update your existing packages while “apt-get dist-upgrade” will update your existing packages, remove obsolete packages and install new available packages as well. You can get breakages either way since new packages might be required as dependencies for upgraded packages in the case of “sudo apt-get upgrade” so using “apt-get dist-upgrade” is still the best way so far. Note: This only applies to LMDE since LMDE is a true rolling release. For any other flavor of Mint you’d use MintUpdate levels 1, 2 and 3 all the way. Perhaps someday Clem and Co. will figure out how to tailor MintUpdate so it works properly in LMDE but considering the rolling aspect of LMDE, I’m at a loss as to how theyn would do that. ref http://b10gger.wordpress.com/2011/03/20/difference-between-apt-get-upgrade-and-apt-get-dist-upgrade/ (thank for this website)
Read more