You are viewing a plain text version of this content. The canonical link for it is here.

Posted to users@subversion.apache.org by "Ramachandran, Vishwanath(IE10)" <Vi...@Honeywell.com> on 2010/02/24 11:52:00 UTC

tree conflict in svn merge

I have subversion 1.6.9 server and 1.6.7 client. I do a merge from
branch to trunk

My working copy is up-to-date. If I do a merge, I end up with a warning
"tree conflicts", but if I resolve the conflict, its says Working copy
is out of date, so I have to do a update and then commit

 

May I know, why these warnings turn up. I should not get these warnings

 

Any suggestions

 

 

Regards

Vishwanath