svu update 遇到 Node remains in conflict
We have some company middleware and sometimes its difficult to find the correct version Im looking for so I often have to update to different versions to test them.
I usually checkout:
I then may update to a different version
Most of the time after a few attempts this will cause the error Node remains in conflict
If I delete the folder and try to do a fresh checkout it just restores what I had. All I want to do is checkout a revision, I have made no changes and it still thinks there are conflicts.
Ive tried to resolve them, but nothing seems to work:
svn update -r 1586
I think the answer I was looking for here was
I dont care about keeping local changes, only to update to a new revision. I have used this command a few times now and it seems to do the trick
Upon looking at my errors again I can see that a lot of the files were likely being changed by tests or builds. I should have added them to an ignore file so that their changes were not detected by svn.