All geek questions in one place

Subversion conflict with deleted file

I have a file that I deleted from subversion, but in the meantime, someone else has updated this file, and now it is in conflict.

I spoke with them, and we agree that it should be removed. Any ideas how we can stop him in conflict?

+4
source share
3 answers

You can use the check for changes command to get a list of modified files. There you can return the conflicting file. This also works in the commit dialog.

+9
source

You can use the svn resolved to remove the conflict state and commit again.

+13
source

I had a similar problem and I used revert in the folder containing the deleted file, provided that the last commit does not contain the file. The only problem is that you need to make the first changes you made to the folder

0
source

Source: https://habr.com/ru/post/1313836/

More articles:


All Articles