SVN incoming edit / delete upon merge

Posted on by
  1. Sometimes when merging in svn, a file has been edited / deleted in both locations. To resolve:
  2. May look something like: 
    user@boxname:/opt/repo/deploy$ svn status
M .
? target
! C deploy
> local delete, incoming edit upon merge
! C foo.py
> local delete, incoming delete upon merge
D xxx.yml
C bar.py
> local add, incoming add upon merge
  3. To resolve, execute for each line: 
    $ svn resolve --accept working ${filename}
  4. EX: 
    $ svn resolve --accept working deploy
$ svn resolve --accept working foo.py
$ svn resolve --accept working bar.py