Welcome to the Onshape forum! Ask questions and join in the discussions about everything Onshape.
First time visiting? Here are some places to start:- Looking for a certain topic? Check out the categories filter or use Search (upper right).
- Need support? Ask a question to our Community Support category.
- Please submit support tickets for bugs but you can request improvements in the Product Feedback category.
- Be respectful, on topic and if you see a problem, Flag it.
If you would like to contact our Community Manager personally, feel free to send a private message or an email.
Options
Merging branches with different Part Studio versions
jacob_kingery
Member Posts: 39 EDU
I just tried to merge a branch (B2) into the main branch (Main), but it said that it was unable to do the merge. The differences are only in the Feature Studio, which is the same version on both branches. However, I did notice that the Part Studio version is different between the branches (316 in B2, 328 in Main). Is this why the merge failed? I could copy and paste the code from B2 into Main, but that doesn't seem like a great development process.
0