Ok, so Highlighter is that log file analysis tool that Jason Luttgens and I created and Nick Harbour contributed a huge amount to in version 1.1 (thanks Nick!).
Ok, so Highlighter is that log file analysis tool that Jason Luttgens and I created and Nick Harbour contributed a huge amount to in version 1.1 (thanks Nick!).
cyberpir8.net is using WP-Gravatar
Every so often, I pop in to see if you have started speaking english around here. Apparently, the answer is still “no”.
I use Facebook for social interaction. I use my blog to communicate with other nerds (usually). Thanks for checking though!
If you discontinued work on your trunk after making your branch, you shouldn’t have seen any conflicts at all when merging the branch back to the trunk.
It sounds like your workaround was essentially just to replace trunk with your branch (which probably would have been more easily done as ‘svn rm url-of-trunk; svn cp url-of-branch url-of-trunk’). That’s fine, but (as I said) *should* have been unnecessary. If your repository is publicly accessible, perhaps you could get convince someone on the Subversion users list (users@subversion.tigris.org) to walk with you through the process you used; maybe see if they can spot some wrong turn taken.
Michael,
Thanks for the response! You’re right, I went through the logs of the then-trunk and the branch and there were definitely changes. Now that I’ve already clobbered all of that, I don’t know if it’s possible to completely re-create the situation, but I’m going to seek assistance from the SVN user list in the future.
They are not so bad if you understand what is fundamentally going on: www.duchnik.com/tutorials/vc/svn-conflicts
Rob, thanks for the link. I agree that knowing why a conflict occurs is not so difficult, but resolving the conflict is still sometimes a pain in the butt. Merging is almost always the only option since nobody wants to lose their work. Coordination is the key to preventing them, which requires organization, which some small groups of developers don’t always practice. Oh well, the more you know and so on and so forth