[snip]
> > No, it's a normal checkout, and I was and am merging at the same
> > folder level (_dev) from where I branched.
> >
> > I noticed however that the mentioned files have been changed in
> > another branche and then were merged to trunk (within the given
> > range 13561-15003). Is this in
> > > Hello World,
> > >
> > > I have implemented a feature into our product. To not break
> things
> > > for the other developers, I used a feature branch as described
> in
> > > the svn book. Now my implementation is complete, so I want to
> merge
> > > my branch back to trunk. In a fully updated
> > Hello World,
> >
> > I have implemented a feature into our product. To not break things
> > for the other developers, I used a feature branch as described in
> > the svn book. Now my implementation is complete, so I want to merge
> > my branch back to trunk. In a fully updated working copy of
> Hello World,
>
> I have implemented a feature into our product. To not break things
> for the other developers, I used a feature branch as described in
> the svn book. Now my implementation is complete, so I want to merge
> my branch back to trunk. In a fully updated working copy of the
> trunk
Hello World,
I have implemented a feature into our product. To not break things for the
other developers, I used a feature branch as described in the svn book. Now my
implementation is complete, so I want to merge my branch back to trunk. In a
fully updated working copy of the trunk (with no lo
