Version Control
Integration with Git repository is used as a method of code versioning. To manage the integration, use the Project > Team > Git menu.
To save a version in the local Git repository, select the “Save Changes” menu.
The Save button opens a dialog for selecting the local Git repository. The “Save and Push” button displays a dialog for selecting the remote Git repository (Git, GitHub, TFS, etc.).
The “Use Credentials” menu uses the credentials of the current operating system user.
To work with the Azure repository, you need to enable an alternative authentication method.
In case of conflicts, a dialog will be displayed to select options for resolving them.
When selecting the “Overwrite Remote” option, the version of the remote repository will be replaced with the local one. When selecting the “Pull” option, Git will attempt to merge the remote and local versions. If there are unresolvable conflicts, a merge dialog will be displayed, where you need to determine which versions (local or remote) will be used in the future.
To select a version, select the process being processed and press the “Apply Remote” or “Apply Local” button at the top of the window. Once all conflicts are resolved, press the “Save” button. After completing all operations, press “Save and Push” for the project again.
To get the latest changes from the remote repository, press the “Pull Changes” button in the Git menu. Versions will be merged based on the same rules as when pushing.
To cancel all changes back to the last save, press the “Discard Changes” button in the Git menu.
To compare the local version with the repository, right-click on the file in the Project palette and select the “Show Changes” menu.
The “Commits” button in the Git menu is used to revert to a specific saved version. To do this, select the desired version, right-click on it, and press Use.
The “Branches” button in the Git menu is used to manage the repository branches. To create a branch, press the “Add” button, to delete the selected branch, the “Delete” button. To manage the states of branches, select the desired branch, right-click on it, and select “Checkout”, “Rebase”, or “Merge” in the menu.
When pressing the “Disconnect” button in Git, the local repository will be deleted and connection with the remote repository will be broken.