Moving Changes from main to a branch

Smilesonica

I just made a number of modifications to a part studio and assembly that was supposed to be a possible rev 2 of the product down the road.  I forgot to create a branch for this.  Is there a way to move the changes made into a new branch after Ive done them?

tim_hess427

Yes, you can merge changes from one branch into another branch. Open the branch that you want to merge into, then right-click on the branch that you want to merge from, then click "merge into current workspace".

More info here: https://www.onshape.com/cad-blog/merging-branches-in-onshape

ilya_baran

You can also look at the document change history and create a version from before your changes (by right-clicking on the correct change).  You can branch from that point then and that can become your main branch (Main is just a name).

brucebartlett

ilya_baran said:

You can also look at the document change history and create a version from before your changes (by right-clicking on the correct change).  You can branch from that point then and that can become your main branch (Main is just a name).

I am not sure about transferring to a branch as the main workspace. Doesn't main have the extra security of not being able to delete at the workspace node. It also appears differently on the tree so gives the user a point of reference to where the main/complete/master/most relevant design info is. I've tried working on braches but have found it best to limit branches to short bursts which are merged back into main as soon as possible if decided they have merit and then deleted to keep history tree clean.

ilya_baran

Correct, Bruce.  The original Main cannot be deleted.

Smilesonica

@ilya_baran @brucebartlett @tim_hess427 Thanks for the comments, that helped.  Got it sorted now.