Skip to content

Instantly share code, notes, and snippets.

@rajvanshipradeep15

rajvanshipradeep15/svn_resolve.md

Forked from Nathaniel100/svn_resolve.md
Created November 24, 2021 13:07
Show Gist options
  • Save rajvanshipradeep15/9721d0783054d517b2af59b7e7a0a2e8 to your computer and use it in GitHub Desktop.
Save rajvanshipradeep15/9721d0783054d517b2af59b7e7a0a2e8 to your computer and use it in GitHub Desktop.
Download ZIP
svn: how to resolve “local edit, incoming delete upon update” message
Raw
svn_resolve.md

svn: how to resolve “local edit, incoming delete upon update” message

$ svn st
!  +  C foo
      >   local edit, incoming delete upon update
!  +  C bar
      >   local edit, incoming delete upon update
$ touch foo bar
$ svn revert foo bar
$ rm foo bar

If the conflict is about directories instead of files then replace touch with mkdir and rm with rm -r.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment