Hi there I get a tree conflict warning in subversion. I have client 1.6.7 and 1.6.9 server. I do a merge from branch to trunk, the result tree conflict.. if i do other way from trunk to branch, i do not get any conflicts
If I resolve the conflicts, it says my working copy[WC] is out of date,, so i have to update my WC. and then resolve the conflicts, commit and then everything is fine..This is really strange,, as WC and the repository is newly created Now my WC is uptodate,, and if I do a merge again say..for the 2nd folder BR2. it still ends up with tree conflicts..and I have to follow the same steps.. Sometimes..I do not get any conflicts..everything work fine note that, the file is not moved or deleted or renamed in the server or in the working copy,, i created two new folders in trunk and branch, and I do a merge,,, the result is conflicts As we have many users across the globe, we cannot expect them to resolve the conflict... All I need a permanent fix... which at very initial stage,, i should not get any warnings..that there is a tree conflict is there a permanent fix for this..please suggest Regards Vishwanath -- You received this message because you are subscribed to the Google Groups "Versions" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/versions?hl=en.
