Once configured MDOQ allows you to work with all source control systems in the same manner.
All actions are carried out through the Source Control Dialog box, which can be launched from an instance by clicking "GitHub"
If you are new to source control, or you aren't fully sure what is meant by "remote branch" or "local branch" checkout the source control quick guide
Running this will pull any remote changes for your branch onto the local branch used by instance.
This allows you to push and change from your instance to the remote branch.
If you would like to merge another branch into yours
- Select the branch you would like to merge in from the dropdown.
- Then click merge.
This will merge that remote branch into your remote branch.
To get these changes onto your instance you can:
- Synchronize the code part of your instance. (This has the added benefit of running any platform specific commands need)
- Run a Git Pull
If the branch you are trying to merge in, is not ahead you will get a 00013 Error.
Performing MDOQ Git actions using your GitHub user
Any Git actions ran via MDOQ will be performed using the username and email of your MDOQ user.
However, if you wish to make commits from your GitHub user this can be configured in your user settings.
If 'GitHub Email' and 'GitHub Username' is populated in your user settings, commits will automatically be made as your GitHub user.
Also, if you enter a private SSH key (that is linked to your GitHub account) into the 'Default private SSH key' field, Git commits will show as verified.