- When I merge changes from my branch into the trunk and then later merge trunk into the branch, I get the error "Trying to add new property 'svnmerge-integrated' with value 'xxx' but property already exists with value 'yyy'.
- Apply the patch discussed here to avoid the problem, and use "svn resolved ." to fix it. Note that there is some controversy around the patch - see this discussion for the details.
Wouter van der Horst's Bookmarks tagged → View Popular
You are here: Diigo Home > Wouter van der Horst's Bookmarks
3Expand
Featured Windows Download: Troubleshoot and Monitor Registry Changes with RegShot
more fromlifehacker.com
Notation: * = Private bookmark and comment|… = Clipping [?] | … = Public highlight [?]
