[version en cours de rédaction] | [version en cours de rédaction] |
Ligne 45 : | Ligne 45 : | ||
{{Tuto Step | {{Tuto Step | ||
|Step_Title=<translate>Pushing changes to the Cloud Repo</translate> | |Step_Title=<translate>Pushing changes to the Cloud Repo</translate> | ||
− | |Step_Content=<translate># Select '''Push''' | + | |Step_Content=<translate>#Select '''Push''' |
− | # Message appears showing the successful push to the '''Origin''' which is in the remote cloud Repo | + | #Message appears showing the successful push to the '''Origin''' which is in the remote cloud Repo</translate> |
− | |||
− | |||
− | |||
|Step_Picture_00=PLC_Source_Control_-_Working_with_GIT_and_TcXaeShell_Ready_to_Push_01_2022-05-05_112446.png | |Step_Picture_00=PLC_Source_Control_-_Working_with_GIT_and_TcXaeShell_Ready_to_Push_01_2022-05-05_112446.png | ||
|Step_Picture_00_annotation={"version":"2.4.6","objects":[{"type":"image","version":"2.4.6","originX":"left","originY":"top","left":0,"top":0,"width":563,"height":346,"fill":"rgb(0,0,0)","stroke":null,"strokeWidth":0,"strokeDashArray":null,"strokeLineCap":"butt","strokeDashOffset":0,"strokeLineJoin":"miter","strokeMiterLimit":4,"scaleX":1.07,"scaleY":1.07,"angle":0,"flipX":false,"flipY":false,"opacity":1,"shadow":null,"visible":true,"clipTo":null,"backgroundColor":"","fillRule":"nonzero","paintFirst":"fill","globalCompositeOperation":"source-over","transformMatrix":null,"skewX":0,"skewY":0,"crossOrigin":"","cropX":0,"cropY":0,"src":"https://stuga.dokit.app/images/d/d2/PLC_Source_Control_-_Working_with_GIT_and_TcXaeShell_Ready_to_Push_01_2022-05-05_112446.png","filters":[]},{"type":"wfarrow2line","version":"2.4.6","originX":"center","originY":"center","left":107.5,"top":211,"width":109,"height":52,"fill":"rgba(255,0,0,0)","stroke":"#FF0000","strokeWidth":4,"strokeDashArray":null,"strokeLineCap":"round","strokeDashOffset":0,"strokeLineJoin":"miter","strokeMiterLimit":4,"scaleX":1,"scaleY":1,"angle":0,"flipX":false,"flipY":false,"opacity":1,"shadow":null,"visible":true,"clipTo":null,"backgroundColor":"","fillRule":"nonzero","paintFirst":"fill","globalCompositeOperation":"source-over","transformMatrix":null,"skewX":0,"skewY":0,"x1":54.5,"x2":-54.5,"y1":-26.000602095158854,"y2":26.000602095158854,"x2a":-33.00431850550966,"y2a":24.609315968071538,"x2b":-39.89366935025687,"y2b":10.168511110378152},{"type":"wfarrow2circle","version":"2.4.6","originX":"center","originY":"center","left":162,"top":185,"width":16,"height":16,"fill":"#aaa","stroke":"#666","strokeWidth":0,"strokeDashArray":null,"strokeLineCap":"butt","strokeDashOffset":0,"strokeLineJoin":"miter","strokeMiterLimit":4,"scaleX":1,"scaleY":1,"angle":0,"flipX":false,"flipY":false,"opacity":0.5,"shadow":null,"visible":true,"clipTo":null,"backgroundColor":"","fillRule":"nonzero","paintFirst":"fill","globalCompositeOperation":"source-over","transformMatrix":null,"skewX":0,"skewY":0,"radius":8,"startAngle":0,"endAngle":6.283185307179586},{"type":"wfarrow2circle","version":"2.4.6","originX":"center","originY":"center","left":53,"top":237,"width":16,"height":16,"fill":"#aaa","stroke":"#666","strokeWidth":0,"strokeDashArray":null,"strokeLineCap":"butt","strokeDashOffset":0,"strokeLineJoin":"miter","strokeMiterLimit":4,"scaleX":1,"scaleY":1,"angle":0,"flipX":false,"flipY":false,"opacity":0.5,"shadow":null,"visible":true,"clipTo":null,"backgroundColor":"","fillRule":"nonzero","paintFirst":"fill","globalCompositeOperation":"source-over","transformMatrix":null,"skewX":0,"skewY":0,"radius":8,"startAngle":0,"endAngle":6.283185307179586},{"type":"wfnumberedbullet","version":"2.4.6","originX":"left","originY":"top","left":165,"top":165,"width":25,"height":25,"fill":"rgb(0,0,0)","stroke":"#FF0000","strokeWidth":0,"strokeDashArray":null,"strokeLineCap":"butt","strokeDashOffset":0,"strokeLineJoin":"miter","strokeMiterLimit":4,"scaleX":1,"scaleY":1,"angle":0,"flipX":false,"flipY":false,"opacity":1,"shadow":null,"visible":true,"clipTo":null,"backgroundColor":"","fillRule":"nonzero","paintFirst":"fill","globalCompositeOperation":"source-over","transformMatrix":null,"skewX":0,"skewY":0,"objects":[{"type":"circle","version":"2.4.6","originX":"center","originY":"center","left":0,"top":0,"width":24,"height":24,"fill":"#FF0000","stroke":null,"strokeWidth":1,"strokeDashArray":null,"strokeLineCap":"butt","strokeDashOffset":0,"strokeLineJoin":"miter","strokeMiterLimit":4,"scaleX":1,"scaleY":1,"angle":0,"flipX":false,"flipY":false,"opacity":1,"shadow":null,"visible":true,"clipTo":null,"backgroundColor":"","fillRule":"nonzero","paintFirst":"fill","globalCompositeOperation":"source-over","transformMatrix":null,"skewX":0,"skewY":0,"radius":12,"startAngle":0,"endAngle":6.283185307179586},{"type":"text","version":"2.4.6","originX":"center","originY":"center","left":0,"top":0,"width":7.79,"height":15.82,"fill":"rgba(255,255,255,255)","stroke":null,"strokeWidth":1,"strokeDashArray":null,"strokeLineCap":"butt","strokeDashOffset":0,"strokeLineJoin":"miter","strokeMiterLimit":4,"scaleX":1,"scaleY":1,"angle":0,"flipX":false,"flipY":false,"opacity":1,"shadow":null,"visible":true,"clipTo":null,"backgroundColor":"","fillRule":"nonzero","paintFirst":"fill","globalCompositeOperation":"source-over","transformMatrix":null,"skewX":0,"skewY":0,"text":"1","fontSize":14,"fontWeight":"normal","fontFamily":"arial","fontStyle":"normal","lineHeight":1.16,"underline":false,"overline":false,"linethrough":false,"textAlign":"left","textBackgroundColor":"","charSpacing":0,"styles":{} }],"number":1}],"height":369,"width":600} | |Step_Picture_00_annotation={"version":"2.4.6","objects":[{"type":"image","version":"2.4.6","originX":"left","originY":"top","left":0,"top":0,"width":563,"height":346,"fill":"rgb(0,0,0)","stroke":null,"strokeWidth":0,"strokeDashArray":null,"strokeLineCap":"butt","strokeDashOffset":0,"strokeLineJoin":"miter","strokeMiterLimit":4,"scaleX":1.07,"scaleY":1.07,"angle":0,"flipX":false,"flipY":false,"opacity":1,"shadow":null,"visible":true,"clipTo":null,"backgroundColor":"","fillRule":"nonzero","paintFirst":"fill","globalCompositeOperation":"source-over","transformMatrix":null,"skewX":0,"skewY":0,"crossOrigin":"","cropX":0,"cropY":0,"src":"https://stuga.dokit.app/images/d/d2/PLC_Source_Control_-_Working_with_GIT_and_TcXaeShell_Ready_to_Push_01_2022-05-05_112446.png","filters":[]},{"type":"wfarrow2line","version":"2.4.6","originX":"center","originY":"center","left":107.5,"top":211,"width":109,"height":52,"fill":"rgba(255,0,0,0)","stroke":"#FF0000","strokeWidth":4,"strokeDashArray":null,"strokeLineCap":"round","strokeDashOffset":0,"strokeLineJoin":"miter","strokeMiterLimit":4,"scaleX":1,"scaleY":1,"angle":0,"flipX":false,"flipY":false,"opacity":1,"shadow":null,"visible":true,"clipTo":null,"backgroundColor":"","fillRule":"nonzero","paintFirst":"fill","globalCompositeOperation":"source-over","transformMatrix":null,"skewX":0,"skewY":0,"x1":54.5,"x2":-54.5,"y1":-26.000602095158854,"y2":26.000602095158854,"x2a":-33.00431850550966,"y2a":24.609315968071538,"x2b":-39.89366935025687,"y2b":10.168511110378152},{"type":"wfarrow2circle","version":"2.4.6","originX":"center","originY":"center","left":162,"top":185,"width":16,"height":16,"fill":"#aaa","stroke":"#666","strokeWidth":0,"strokeDashArray":null,"strokeLineCap":"butt","strokeDashOffset":0,"strokeLineJoin":"miter","strokeMiterLimit":4,"scaleX":1,"scaleY":1,"angle":0,"flipX":false,"flipY":false,"opacity":0.5,"shadow":null,"visible":true,"clipTo":null,"backgroundColor":"","fillRule":"nonzero","paintFirst":"fill","globalCompositeOperation":"source-over","transformMatrix":null,"skewX":0,"skewY":0,"radius":8,"startAngle":0,"endAngle":6.283185307179586},{"type":"wfarrow2circle","version":"2.4.6","originX":"center","originY":"center","left":53,"top":237,"width":16,"height":16,"fill":"#aaa","stroke":"#666","strokeWidth":0,"strokeDashArray":null,"strokeLineCap":"butt","strokeDashOffset":0,"strokeLineJoin":"miter","strokeMiterLimit":4,"scaleX":1,"scaleY":1,"angle":0,"flipX":false,"flipY":false,"opacity":0.5,"shadow":null,"visible":true,"clipTo":null,"backgroundColor":"","fillRule":"nonzero","paintFirst":"fill","globalCompositeOperation":"source-over","transformMatrix":null,"skewX":0,"skewY":0,"radius":8,"startAngle":0,"endAngle":6.283185307179586},{"type":"wfnumberedbullet","version":"2.4.6","originX":"left","originY":"top","left":165,"top":165,"width":25,"height":25,"fill":"rgb(0,0,0)","stroke":"#FF0000","strokeWidth":0,"strokeDashArray":null,"strokeLineCap":"butt","strokeDashOffset":0,"strokeLineJoin":"miter","strokeMiterLimit":4,"scaleX":1,"scaleY":1,"angle":0,"flipX":false,"flipY":false,"opacity":1,"shadow":null,"visible":true,"clipTo":null,"backgroundColor":"","fillRule":"nonzero","paintFirst":"fill","globalCompositeOperation":"source-over","transformMatrix":null,"skewX":0,"skewY":0,"objects":[{"type":"circle","version":"2.4.6","originX":"center","originY":"center","left":0,"top":0,"width":24,"height":24,"fill":"#FF0000","stroke":null,"strokeWidth":1,"strokeDashArray":null,"strokeLineCap":"butt","strokeDashOffset":0,"strokeLineJoin":"miter","strokeMiterLimit":4,"scaleX":1,"scaleY":1,"angle":0,"flipX":false,"flipY":false,"opacity":1,"shadow":null,"visible":true,"clipTo":null,"backgroundColor":"","fillRule":"nonzero","paintFirst":"fill","globalCompositeOperation":"source-over","transformMatrix":null,"skewX":0,"skewY":0,"radius":12,"startAngle":0,"endAngle":6.283185307179586},{"type":"text","version":"2.4.6","originX":"center","originY":"center","left":0,"top":0,"width":7.79,"height":15.82,"fill":"rgba(255,255,255,255)","stroke":null,"strokeWidth":1,"strokeDashArray":null,"strokeLineCap":"butt","strokeDashOffset":0,"strokeLineJoin":"miter","strokeMiterLimit":4,"scaleX":1,"scaleY":1,"angle":0,"flipX":false,"flipY":false,"opacity":1,"shadow":null,"visible":true,"clipTo":null,"backgroundColor":"","fillRule":"nonzero","paintFirst":"fill","globalCompositeOperation":"source-over","transformMatrix":null,"skewX":0,"skewY":0,"text":"1","fontSize":14,"fontWeight":"normal","fontFamily":"arial","fontStyle":"normal","lineHeight":1.16,"underline":false,"overline":false,"linethrough":false,"textAlign":"left","textBackgroundColor":"","charSpacing":0,"styles":{} }],"number":1}],"height":369,"width":600} | ||
Ligne 60 : | Ligne 57 : | ||
#Select '''Home''' then '''Changes''' this shows the commit message (Required) | #Select '''Home''' then '''Changes''' this shows the commit message (Required) | ||
#Enter the message and add the '''Machine''' and '''Job Number''' to the message | #Enter the message and add the '''Machine''' and '''Job Number''' to the message | ||
− | #Push Commit , this Commits the changes | + | #Push Commit , this Commits the changes locally |
− | |||
− | |||
Ligne 69 : | Ligne 64 : | ||
{{Tuto Step | {{Tuto Step | ||
|Step_Title=<translate>Pushing the changes to the Remote Repository</translate> | |Step_Title=<translate>Pushing the changes to the Remote Repository</translate> | ||
− | |Step_Content=<translate># To save the changes to the remote repository select '''Sync''' | + | |Step_Content=<translate>#To save the changes to the remote repository select '''Sync''' |
− | # Commits ready to be pushed to the Cloud | + | #Commits ready to be pushed to the Cloud |
− | # Select Push to send the changes | + | #Select Push to send the changes |
Ligne 82 : | Ligne 77 : | ||
}} | }} | ||
{{Tuto Step | {{Tuto Step | ||
− | |Step_Title=<translate>Setting up for | + | |Step_Title=<translate>Setting up for Merging the Branched code</translate> |
|Step_Content=<translate>#Make sure all changes have been committed and pushed steps 4 and 5 | |Step_Content=<translate>#Make sure all changes have been committed and pushed steps 4 and 5 | ||
#Select '''Home''' then select '''Branches''' | #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. go back to steps 4 and 5 | + | #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. go back to steps 4 and 5 and push the remaining changes. |
#Press '''Merge''' to open the merge window.</translate> | #Press '''Merge''' to open the merge window.</translate> | ||
|Step_Picture_00=PLC_Source_Control_-_Working_with_GIT_and_TcXaeShell_Select_Master_2022-05-05_120900.png | |Step_Picture_00=PLC_Source_Control_-_Working_with_GIT_and_TcXaeShell_Select_Master_2022-05-05_120900.png | ||
Ligne 92 : | Ligne 87 : | ||
|Step_Title=<translate>Merge</translate> | |Step_Title=<translate>Merge</translate> | ||
|Step_Content=<translate>#From the dropdown Menu select the branch to be merged | |Step_Content=<translate>#From the dropdown Menu select the branch to be merged | ||
− | #Keep the option | + | #Keep the option : Commit changes after merging checked |
− | #Press | + | #Press '''Merge''' |
− | #Message to say merge is complete. | + | #Message to say merge is complete:. |
{{Info|...The merge is complete on the local repository, Press Sync to update the remote Repo}} | {{Info|...The merge is complete on the local repository, Press Sync to update the remote Repo}} | ||
Tutorial that outlines the steps that make up a typical TcXaeShell development cycle with GIR source control
Auteur Gareth Green | Dernière modification 9/05/2022 par Gareth Green en cours de rédaction ⧼frevu-button-review-label⧽
Pas encore d'image
Tutorial that outlines the steps that make up a typical TcXaeShell development cycle with GIR source control
PLC, Source Control, GIT
Create a branch locally to hold the code involved with the changes.
See document for Making a Branch
The branch name is made up of three parts:
There may be more than one branch for the 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.
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.
When complete the remote branch repository will contain all the changes made and committed to the local branch
Steps 4 and 5 can repeat many times during a development cycle
The local branch has been updated and merged with the local master and the remote branch and master repository match (same change level)
en none 0 Draft
Vous avez entré un nom de page invalide, avec un ou plusieurs caractères suivants :
< > @ ~ : * € £ ` + = / \ | [ ] { } ; ? #