Skip to main content

Configure Source Control

Configure Source Control

It is necessary to configure an external tool when you'reWhen working with a solution fromstored repository,in a repository and using theScene Composer's built-in source control offeredintegration, byyou SceneComposer.must configure an external comparison and merge tool.

To doconfigure thisthis, open the Preferences dialog (fromFile "File" > "Preferences")Preferences wherein youthe canmenu bar). In the Source Control section, specify the externalapplication tool that willto be used for merge and specificdiff commandsoperations. You can also define the command-line parameters required for "Merge"each operation (e.g. Merge and "Diff"Diff).

operations.

Before Beforeperforming any of thesemerge operations, ensure that the external merge tool hasis to be enabled by usingselecting the availablecorresponding check-box.checkbox.

drawing-7-1754290511.pngdrawing-5-1771575834.png
Enabled If enabled, the use of athe configured merge tool is enabled.
Merge Tool SetsConfigures the path to the external merge tool to use.
Merge Specifies the commandcommands for merge operations.
Diff Specifies the commandcommands for diff operations.
Synchronized mode If enabled, willScene assureComposer thatautomatically retrieves the solution status is always retrieved from the serverserver. byBecause default. Communicationcommunication with the server iscan abe timetime-consuming, consumingyou operationmay that'schoose whyto disable this option. In that case, you can alsomanually decideupdate notthe tostatus useby thisselecting option and perform an explicit "Refresh status" operationstatus from the source control context menu (onlywhenever if necessary).needed. 

The value of the check-boxEnabled checkbox is evaluated only when a solution is opened or created.