![]() Unfortunately, because of changes in the data format used in SVN 1.6, I can't use that SVN < 1.6 version on a project that I checked out with SVN 1.6. Apparently, a possible workaround for me is to install a SVN client that uses a SVN version before 1.6, which apparently ignores this tree conflict message from the server. Our server is running SVN 1.3.1, and I have no control over upgrading it. However, I get this message after I do a fresh checkout of the branch I want to merge to, and then request a merge from another branch to what I just checked out. Yeah, I've already "googled" this very much. ![]() If you do a merge operationĪnd you are not happy with the result, then before trying something else you ![]() Noticed that the conflict has already been created by the previous merge Subversion is complaining because after you did a merge which generated aĬonflict, you then did the same merge again. This is SVN error but not Subversive, so please try to google it. Igor Burilo wrote on Fri, 29 January 2010 03:50 > Can someone give me, or find, reasonable instructions for how to do this? > that I can't check in, but I still have to merge the checked-in changes on > In one of the two projects, I also have some changes in checked out files The doc page on the "SVN merge dialog" is not helpful at I cannot find clear step-by-step instructions > merge the changes I've made in two separate projects (same branch, > plugin every day, but I almost never have to do a merge. > I'm using Eclipse 3.5.1 and the Subversive plugin. I would advice you at first to read about merging in SVN, here are links inĪll merge actions you can accomplish in Subversive with Merge
0 Comments
Leave a Reply. |