1

This is totally newbie question but I can't find any answer elsewhere

When I update my library (should be readonly) with

svn update

it said

Tree conflict on 'lib/some_meowingful_lib-1.1.1.2.jar'
   > local file unversioned, incoming file add upon update
Select: (r) mark resolved, (p) postpone, (q) quit resolution, (h) help: p

Clearly I have modify something here. I want to discard and get updated version from server. What can I do ? It is same as Git stash (or discard), then pull.

Tried delete the file then (p) postpone (it will show this again when run svn resolve), if (r), then this option disappear. Then the file gone. Nothing can be done. svn update won't see conflict anymore.

Haha TTpro
  • 5,137
  • 6
  • 45
  • 71
  • Is some other process using this jar . See if any other process is running and has this jar loaded ? – parthi Sep 02 '20 at 04:02
  • I just want to revert to its original state in SVN repo – Haha TTpro Sep 02 '20 at 04:06
  • It is like Git discard all change then pull – Haha TTpro Sep 02 '20 at 04:06
  • https://stackoverflow.com/questions/738367/why-am-i-getting-tree-conflicts-in-subversion Please check this – parthi Sep 02 '20 at 04:08
  • @parthi my case does not have anything to do with commit. I just want to revert everything back. Simple solution would be clone the svn again in another folder. However, it is 10 GB of data. – Haha TTpro Sep 02 '20 at 13:41
  • I don't understand, "this option disappear" - which option? "Then the file gone" - in which scenario? After you delete it manually or after you pick (r)? I guess (r) should be fine here, unless you added the file to .gitignore – Line Sep 16 '20 at 12:51

0 Answers0