Eclipse "Team Synchronize View" equivalent for CVS Merge
已回答
I have just moved from Eclipse to PhpStorm. We're still working with CVS (I know ...), and I need to accomplish the following workflow:
- Work in a branch, say "feature1", make some changes and commit them.
- Then work in the HEAD and MERGE the changes from that branch into the HEAD *manually*, i. e. I would like to see the files that would be updated first before updating them. If I use "VCS > Update Project > Branch Merging", all files will be updated automatically, some with conflicts.
So my question: While still working with CVS, how can I carefully, manually and efficiently merge changes from a specific branch into the HEAD?
Thanks!
Jay.
请先登录再写评论。
I don't think it is possible, unfortunately.
Probably the Incoming changes view can be of some help.
Okay, thanks. Then how do I best achieve the following workflow with PhpStorm and CVS:
Say we're working on a single development branch on a few smaller features that we commit into the branch. At a certain time we now want to merge only one of the features into the HEAD. How is that achieved? It seems than in PhpStorm I always have to merge ALL of the changes into the head. How is this problem solved?
Thanks.