I just had this problem, and the cause seemed to be that a directory had been flagged as in conflict. To fix:
svn update
svn resolved <the directory in conflict>
svn commit
Related Contents:
- How to undo a merge (without commit)?
- How to edit log message already committed in Subversion?
- How and/or why is merging in Git better than in SVN?
- Why am I getting tree conflicts in Subversion?
- Remove unnecessary svn:mergeinfo properties
- How do I see the last 10 commits in reverse-chronological order with SVN?
- Using TortoiseSVN how do I merge changes from the trunk to a branch and vice versa?
- Is git-svn dcommit after merging in git dangerous?
- Merge a Branch into Trunk
- SVN- How to commit multiple files in a single shot
- SVN how to resolve new tree conflicts when file is added on two branches
- How to get a list of all Subversion commit author usernames?
- How to merge a branch into trunk?
- Merge trunk to branch in Subversion
- Subversion branch reintegration
- How can I prevent Subversion commits without comments?
- SVN commit failed: Directory out of date
- How to make svn diff produce file that patch would apply, when svn cp or svn mv was used?
- Renamed file, now SVN not allowing me to commit?
- svn: local commits
- How can I force subversion to commit an unchanged file?
- SVN commit error after deleting files locally
- Subversion: howto find all revisions that are not merged to trunk?
- SVN – unable to merge branch back into trunk – numerous tree-conflicts
- Subversion branch reintegration in v1.6 [duplicate]
- Subversion: How to merge a specific commit
- Subversion stuck due to “previous operation has not finished”?
- Updates were rejected because the remote contains work that you do not have locally
- SVN Commit specific files
- SVN Error – Not a working copy
- Better way to revert to a previous SVN revision of a file?
- Merging: Hg/Git vs. SVN
- How do I remove a folder from source control with TortoiseSVN?
- Extract TortoiseSVN saved password
- SVN – Checksum mismatch while updating
- SVN 405 Method Not Allowed
- Is there a command to list SVN conflicts?
- Getting the last revision number in SVN?
- One SVN repository or many?
- SVN – Change working copy to point at new svn path
- svn: E170000: Unrecognized URL scheme for httpxxxx
- How do I fix this Subversion MKCOL error?
- How do I determine the SVN working copy layout version?
- SVN reverse merge?
- Working Copy Locked
- Failed to run the WC DB work queue associated with file
- How do I view all ignored patterns set with svn:ignore recursively in an SVN repository?
- Subversion: ignore modifications to a file locally on one client only
- SVN icon overlays not showing properly
- SVN ignore that is local to working copy?