On 4/27/2011 12:20 AM, Jonatan Soto wrote:
Sorry if we were mistaken, but when the merge finishes (following
Ryan's indications) it says:
Summary of conflicts: Text conflicts: 15 Tree conflicts: 8
Perhaps the problem is that we are using the latest subclipse plugin
as a client and if we are not
Hi Mike,
Sorry if we were mistaken, but when the merge finishes (following Ryan's
indications) it says:
Summary of conflicts:
Text conflicts: 15
Tree conflicts: 8
Perhaps the problem is that we are using the latest subclipse plugin as a
client and if we are not wrong it is based on 1.6 clien
Thanks a lot for you useful responses!
On Tue, Apr 26, 2011 at 7:24 PM, Ryan Schmidt <
subversion-20...@ryandesign.com> wrote:
>
> On Apr 26, 2011, at 11:47, Jonatan Soto wrote:
>
> > We are facing some problems during a merge process from a branch to trunk
> (2 URL merge). Note that we didn't s
On 4/26/2011 9:47 AM, Jonatan Soto wrote:
Subversion 1.3
tree conflicts.
Wait, what? Tree conflicts weren't introduced until svn 1.6. Something
strange is going on here if you think you're using 1.3 but you're
getting reports of tree conflicts.
(And yes, as you suspected the real solution i
On Apr 26, 2011, at 11:47, Jonatan Soto wrote:
> We are facing some problems during a merge process from a branch to trunk (2
> URL merge). Note that we didn't synch the branch with the trunk at any time.
> We want apply all changes made in that branch back to the trunk but for some
> reason t
Hi all,
We are facing some problems during a merge process from a branch to trunk (2
URL merge). Note that we didn't synch the branch with the trunk at any time.
We want apply all changes made in that branch back to the trunk but for some
reason the results that are we getting are very odd. Lots
