shacaco Posted February 19, 2012 Report Share Posted February 19, 2012 Hi I have plastic 4.0. I have a child branch pointing to a parent one. After I work on the child branch for a while, I want to merge the final changeset with a changeset on the parent branch. how can I do it using the gui? thanks. Link to comment Share on other sites More sharing options...
carpediemevive Posted February 20, 2012 Report Share Posted February 20, 2012 In the GUI, switch your workspace to the "parent" branch. Then right click on the "child" branch and click "Merge from this branch..." That will pull the changes in the child branch into the parent branch. Link to comment Share on other sites More sharing options...
manu Posted February 21, 2012 Report Share Posted February 21, 2012 Hey shacaco, I think you will find very useful this guide: https://www.plasticscm.com/infocenter/quick-start.aspx Link to comment Share on other sites More sharing options...
shacaco Posted February 23, 2012 Author Report Share Posted February 23, 2012 thanks guys, That Helps a lot. Link to comment Share on other sites More sharing options...
manu Posted February 23, 2012 Report Share Posted February 23, 2012 You are welcome, feel free to ask any question, we are here to help. Link to comment Share on other sites More sharing options...
Aaron K Posted May 9, 2012 Report Share Posted May 9, 2012 Just revisiting this thread because I had a quick question. Is there a reason for not having a "Merge to branch" operation? When I finish working on a branch it'd be really helpful to just go "merge this one into the parent thanks" without having to switch to it. It would save a step in the process. Just wondering. Link to comment Share on other sites More sharing options...
manu Posted May 10, 2012 Report Share Posted May 10, 2012 the "merge to" functionality is finished and it's going to be public yet. It's going to be only valid when the merge is automatic, no both contributors conflicts are allowed. Link to comment Share on other sites More sharing options...
psantosl Posted May 11, 2012 Report Share Posted May 11, 2012 Anyway, there's a reason why we refused to implement it for a long time: normally when you merge you've to get your code build and tested. "Merge-to" means you directly merge to the destination branch and checkin, in one single step, so it is very easy to skip building and testing the code... which ends up being a not very good practice... @psluaces Link to comment Share on other sites More sharing options...
Aaron K Posted May 14, 2012 Report Share Posted May 14, 2012 Yeah that makes sense however the way I work is to merge from the main branch into mine, build and test and check it's all good. Then having a straight merge to would be nice. Glad to see it's coming though! Link to comment Share on other sites More sharing options...
Recommended Posts
Archived
This topic is now archived and is closed to further replies.