prog112 Posted November 18, 2016 Report Share Posted November 18, 2016 Hey, I have the following situation: I'd like to revert [like in git] my main branch to the commit highlighted with blue, without breaking further child branch /main/Audio. How can I do it? Link to comment Share on other sites More sharing options...
manu Posted November 21, 2016 Report Share Posted November 21, 2016 Hello prog112, you will want to use the subtractive merge for the last two changesets in your /main branch. The subtractive merge is able to remove the changeset content and keep track of the operation, you'll see a red merge link representing it. In your case as you need to "remove" the changes of the last two changesets please do the following: 1) Select the changeset having the blue arrow, now with the control (Ctrl) key pressed select the last changeset on main. 2) Right click the last changeset selected and select "Advance merge" -> "Subtractive merge from this changeset interval" 3) Continue the operation as a regular merge, but notice how the changes introduced in the last two changesets are reverted. A new changeset will be created after checking-in the subtractive merge result, notice the child branch will not be affected since all the Plastic SCM changesets are static configurations Link to comment Share on other sites More sharing options...
prog112 Posted November 21, 2016 Author Report Share Posted November 21, 2016 Thanks, that worked very fine! Unrelated question but I'd like to know: My team uses Plastic server which I launched on our dedicated server. For that, should we go and purchase for ourselves a Team license or which one? Link to comment Share on other sites More sharing options...
manu Posted November 21, 2016 Report Share Posted November 21, 2016 Yes! The team license will work for you if your team size is less than 15 members Link to comment Share on other sites More sharing options...
Recommended Posts
Archived
This topic is now archived and is closed to further replies.