I have my trunk, and I have a branch: toast. I've made changes to the toast branch and want to merge them back into trunk. This has been done many times before and I didn't expect to encounter any problems.
I have a directory of images that haven't been altered at all, nor has the path to the directory. Can someone please explain to me why I would get a tree conflict for every image in the directory?
You have to inspect logs of trunk and branch file(s) in order to find source of problem.
In common "tree conflict" in SVN means "merged sources was moved|renamed on one side and edited on another in parallel" and no any other reasons!!!