Re: [subversive-dev] Merge trunk into branch with Subversive

[Alexander Gurov <alexander.gurov@xxxxxxxxxxxx>]

Hi,

Yes, you're absolutely right. And here are my toughts on the matter: when I do merge myself I prefer to commit all local changes before starting the merge process and also I prefer to update my working copy to the head revision too.
Also, it would be nice if you could tell us what you find misleading or confusing in the merge dialog. Thank you in advance.

Best regards,
Alexander Gurov,
Subversive Team.

18.11.2011 13:01, Celinio Fernandes пишет:

Hi,

my working copy is a copy of the branch.

I am working on the branch and, as a best practice, i want to merge the trunk into my branch from time to time.

To avoid too many conflicts the way i want to merge the branch into the trunk.

I find the merge dialogs in Subversive a bit confusing :

http://www.eclipse.org/subversive/documentation/teamSupport/merge_dialog.php

Since I do not want to make any regrettable mistake, i prefer to ask here which option i should choose.

I believe, if my working copy is connected to the branch, i should select the first tab (URL) and browse the URL to the trunk.

So it will merge my working copy with the trunk that is my working copy will be modified/updated with the changes from the trunk but no commit/change will happen in the trunk.

Then i will update the branch.

Am i right ?

Thanks for helping.

_______________________________________________
subversive-dev mailing list
subversive-dev@xxxxxxxxxxx
https://dev.eclipse.org/mailman/listinfo/subversive-dev