svn 报错及解决

• 报错：
  svn: E155015: One or more conflicts were produced while merging r68508:73308 into
  '[分支]' --
  resolve all conflicts and rerun the merge to apply the remaining
  unmerged revisions
  解决（网上答案，地址：https://stackoverflow.com/questions/20473565/resolve-all-conflicts-and-rerun-the-merge-to-apply-the-remaining-in-autoated-mer）：
  This happens when some of the commits were already "cherry-picked", i.e. merged using the -r x:y flag. In such case subversion first merges everything up to x and than everything above y. If merging x fails, it gives this error.
  I don't think you should be working around it. If you want to do the merge, just do it manually. If you don't, just tell the script to stop trying.

• 报错（MAC 终端）：
  svn: E205007: Could not use external editor to fetch log message; consider setting the $SVN_EDITOR environment variable or using the --message (-m) or --file (-F) options
  svn: E205007: None of the environment variables SVN_EDITOR, VISUAL or EDITOR are set, and no 'editor-cmd' run-time configuration option was found
  解决：
  终端输入：
  export SVN_EDITOR=vim