Eclipse Community Forums: Subversive » Cherry picking changes during merge

Home » Eclipse Projects » Subversive » Cherry picking changes during merge

Cherry picking changes during merge [message #531766]

Thu, 06 May 2010 02:04

Eclipse User

(I apologize before hand if this has been discussed previously; however I was not able to find an adequate solution. Figured someone may point me in the right direction )

During integration of one of the branches back into the trunk via the merge dialog(1 URL), all of the changes are applied to the working copy of the trunk. The only way to remove unwanted changes is by using the "Revert" command in the Synchronization view.

This seems a bit counterintuitive. Is there anyway to choose the changes before they are merged into the working copy?

Appreciate any help!

Thanks,

Vitaliy

[Updated on: Thu, 06 May 2010 02:06] by Moderator

Re: Cherry picking changes during merge [message #532769 is a reply to message #531766]

Tue, 11 May 2010 04:01

Eclipse User

Hello Vitaliy,

> Is there anyway to choose the changes before they are merged into the
> working copy?
No, when you run merge command all changes are applied.

> During integration of one of the branches back into the trunk via the
> merge dialog(1 URL), all of the changes are applied to the working copy
> of the trunk. The only way to remove unwanted changes is by using the
> "Revert" command in the Synchronization view.
> This seems a bit counterintuitive. Is there anyway to choose the changes
> before they are merged into the working copy?
>
> Appreciate any help!
>
> Thanks,
>
> Vitaliy

--
Best regards,
Igor Burilo

Previous Topic:	team --> commit integration
Next Topic:	Turn off auto commit of new files

Goto Forum:

-=] Back to Top [=-

Current Time: Mon Sep 22 17:37:45 EDT 2025

.:: Contact :: Home ::.

Breadcrumbs

Sign up to our Newsletter