You are indicating that you want to add the commit from this branch to the main branch. From the popup that appears, make sure the commit on your wish-list branch is highlighted. Double-click the main branch (in this case master for Git or default for Mercurial) to switch to that branch. It can be configured to use Merge as its. Subclipse is an Eclipse plugin providing support for Subversion within the Eclipse IDE. To configure SourceTree to use Merge for merging files: Open the SourceTree Preferences dialog and choose the Diff tab. Select Araxis Merge as the Visual Diff Tool. Type the path to UnityYAMLMerge in the Merge Command text field. Select Custom in the Merge Tool dropdown.
0 Comments
Leave a Reply. |