问题
Someone please help me understand my mistake/misunderstanding of what's happening below:
This is an SVN repository.
As you can see, I have two branches and committed a few independent changes to the release. According to the log above, both server branches map back into the current local release branch which is a few commits ahead.
If I go to push the changes of release back to the remote server. I get the following error:
It would seem the error is some how related to an SVN problem "409 conflict" but searching around doesn't reveal any useful information.
So I've tried pulling changes from both trunk and the release branch on remote and neither have new changes. Why am I getting an error message that my local branch is out of date?
回答1:
Well I can't explain what caused the problem.
I was able to resolve the issue by doing a soft reset back to the remote release branch shown in the photo above. This resulted in my changes being uncommitted but not lost and I was able to recommit and push the changes without the SVN 409 Conflict error.
来源：https://stackoverflow.com/questions/25547760/smartgit-file-or-directory-out-of-date-error-message-when-it-is-not