Tosca Tutorial | Lesson 92 - Create, Merge and Delete Branches | Multi-User Workspace |

[@Yash_Chavan]

Thank you so much

[@QASCRIPT]

Welcome

[@helloworld11155]

Thank you

[@QASCRIPT]

Welcome!

[@varma_vlogs]

Hi while creating user individual branches then we can create modules and execution sections

[@QASCRIPT]

Yes. Once you create a workspace using the new branch, you can continue to create different sections and continue with your automation.

[@varma_vlogs]

@@QASCRIPT Tq

[@benjamin-yt4mm]

Hi, I got an error while I merge the branch. Is there any option to solve this association conflict? When I click the "show affected object"it shows me a modify popup screen but I can not drag and drop object. The error is: "Merge cannot be performed. 1 object(s) have association changes in master and branch. Show affected objects in master?"

[@QASCRIPT]

Please send the error screenshot to [e-mail]

[@jaiprakashbagadiya359]

how to handle merging of multiple branches and changes and what if one of the merge breaks things ? how to handle that case

[@QASCRIPT]

It is very similar to how you manage development branches. You have to resolve conflicts errors during merge

[@vinayram4303]

After selecting the Created branch i can't Click on the Check Box for using Standard Modules , can u tell y ?

[@QASCRIPT]

Yes. You don't need to select it as it is created from the main workspace which already uses the standard modules.

[@vinayram4303]

@@QASCRIPT we want to work on branch file I tried to add the standard module will are not available only. So Can u give clarity on that

[@QASCRIPT]

You can still directly import the standard subset inside the branch workspace.

[@vinayram4303]

@@QASCRIPT subset contains the already existing modules but if I want to add new standard module I should click on the check box will creating the branch work space which is disabled.i have checked u r video also in that also that option is disabled only.

[@QASCRIPT]

You don't need to add standard modules again in the branch if it is already present.