1. I made the branch from my trunk.
2. I made changes on this branch.
3. I would merge back my branch into the trunk.
For this operation I would use "Merge two different trees"
I choosed on the merged different trees option on check outed trunk workspace with the following settings.
From : My_Branch
To: My trunk
Working copy: My checkouted trunk
whan I click Merge. the SVN merged the branch into the trunk without conflicts. But I commit changes to the branch before.
> On 29 October 2013 10:15, Gergely Toth <gergelyk3 at gmail dot com> wrote:
>
> > Hello Simon,
> >
> > On the branch I made some changes in some files.
> >
>
> OK
>
> I would merge the branch with manual merge.
> >
>
> Merge the branch with what? What is a manual merge?
>
>
> > I would see what is the changes in the branch because if I don't know it
> > caused some errors in my trunk.
> >
>
> "Show log" for the branch will show you which files changed and you can get
> the diff for each changed file.
>
> My colleague took changes in the branch. If the Tortoise not show what is
> > the difference between the branch and the trunk during the merge it caused
> > errors.
> >
>
> Don't understand.
>
> My problem is when I would merge the branch into the trunk the Tortoise not
> > showed what is the diff. I know the branch contains diffs but I can not
> > check.
>
>
> After the merge your working copy files will be changed. Use Diff to see
> the changes.
>
>
> > It is clear?
> >
>
> Sorry but I have no idea what you are trying to describe here.
>
> Simon
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3067374
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-10-29 12:51:37 CET