|Always get tree conflict on merge [message #557320]
||Mon, 06 September 2010 16:34
| Tom Chiverton
Registered: August 2010
Can anyone think why I would always get tree conflicts when merging a branch on to the trunk in a particular project ?|
If I run 'svn diff' on the trunk and branch from the console (svn diff https://.../trunk https://.../branches/mybranch), it lists changes to files, but doesn't appear to explode the same way Subversive does. The changes it lists are all fairly minor.
The local copy of the trunk I'm trying to merge my branch to has no outstanding changes.
Eclipse 3.5 on Win32 with the latest Subversive for it.
Tried both the native Java and binary win32 connectors, to no noticeable difference, ditto using the reintergrate tab (or not).
[Updated on: Mon, 06 September 2010 16:40]
Report message to a moderator
Powered by FUDForum
. Page generated in 0.05693 seconds