These steps outline typical actions that make up a development cycle for changing code on a machine, saving changes locally and saving to the cloud repository using Git as the Source control tool.
Machine Reference S095_ followed by an underscore character _
Service Job Number 1234567890_ followed by an underscore character _
Text that identifies the change Infeed, Outfeed, Timer Mod.
There may be more than one branch for changes under the service job. This method of naming aids traceability. For example S095_123454321_ClampMod and S095_123454321_InfeedTiming are two branches under the same job number.
Étape 2 - Saving the changes
The change has been saved as a local change.
Press Sync to save the changes to the cloud repository. This ensures that the local Branch is now being tracked as a branch being attached to Remote repository
Étape 3 - Pushing changes to the Cloud Repo
Select Push
Message appears showing the successful push to the Origin which is in the remote cloud Repo
2.
Étape 4 - Add More Changes and Commit
Add more changes to the code,
Select Home then Changes this shows the commit message (Required)
Enter the message and add the Machine and Job Number to the message
Push Commit , this Commits the changes Locally
This cycle of changing code and pushing to the cloud can be extensive and can cover many hours work. By pushing to the cloud the work is backed up and code can be restored if needed.
Étape 5 - Setting up for Merging the Branched code
View Team Explorer
Select Home then select Branches
Mouse click on master when it is selected it will be in bold text. If this does not work and there is an error message, the most likely cause is there are committed changes waiting to be pushed to the cloud Repo
Press Merge to open the merge window.
Étape 6 - Merge
From the dropdown Menu select the branch to be merged
Keep the option to Commit changes after merging
Press merge
Message to say merge is complete.
...The merge is complete on the local repository, Press Sync to update the remote Repo
Étape 7 - Sync
Sync lists the commits that need to be pushed to the Remote Repo Origin
Press Push
Message indicating successful push to origin master
Étape 8 -
Commentaires
ennone0Draft
×
Erreur de saisie dans le nom du tutoriel
Vous avez entré un nom de page invalide, avec un ou plusieurs caractères suivants :
< > @ ~ : * € £ ` + = / \ | [ ] { } ; ? #
Connexion
Pas encore enregistré ? Créez un compte pour profiter de toutes les fonctionnalités du service !