Subversion/TortoiseSVN recommends following the trunk/ branches/ tags approach for development. Main development occurs in trunk, new features/experimental changes occur in a branch and are merged back, and each release is tagged.
However, I have noticed (serious) issues in merging changes in project files. Specifically, Main.xaml also contains code for the workflow visualization, which create -in my opinion- unnecessary conflicts during merging that are practically impossible to resolve without corrupting the file.
How do you go about merging project folders using Subversion/TortoiseSVN?