| [version en cours de rédaction] | [version en cours de rédaction] |
| Ligne 23 : | Ligne 23 : | ||
See document for [[PLC Source Control - Create a Development Branch|Making a Branch]] | See document for [[PLC Source Control - Create a Development Branch|Making a Branch]] | ||
| + | |||
The branch name is made up of three parts: | The branch name is made up of three parts: | ||
#'''Machine Reference''' S095_ followed by an underscore character _ | #'''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</translate> | + | #'''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.</translate> | ||
|Step_Picture_00=PLC_Source_Control_-_Working_with_GIT_and_TcXaeShell_New_Branch_2022-05-05_103907.png | |Step_Picture_00=PLC_Source_Control_-_Working_with_GIT_and_TcXaeShell_New_Branch_2022-05-05_103907.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":559,"height":268,"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/7/7e/PLC_Source_Control_-_Working_with_GIT_and_TcXaeShell_New_Branch_2022-05-05_103907.png","filters":[]},{"type":"wfarrow2line","version":"2.4.6","originX":"center","originY":"center","left":243.5,"top":255,"width":111,"height":24,"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":55.5,"x2":-55.5,"y1":12.000118256780581,"y2":-12.000118256780581,"x2a":-37.642403552104554,"y2a":0.045887268044311647,"x2b":-34.261047037851654,"y2b":-15.592732495973209},{"type":"wfarrow2circle","version":"2.4.6","originX":"center","originY":"center","left":299,"top":267,"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":188,"top":243,"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}],"height":288,"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":559,"height":268,"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/7/7e/PLC_Source_Control_-_Working_with_GIT_and_TcXaeShell_New_Branch_2022-05-05_103907.png","filters":[]},{"type":"wfarrow2line","version":"2.4.6","originX":"center","originY":"center","left":243.5,"top":255,"width":111,"height":24,"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":55.5,"x2":-55.5,"y1":12.000118256780581,"y2":-12.000118256780581,"x2a":-37.642403552104554,"y2a":0.045887268044311647,"x2b":-34.261047037851654,"y2b":-15.592732495973209},{"type":"wfarrow2circle","version":"2.4.6","originX":"center","originY":"center","left":299,"top":267,"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":188,"top":243,"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}],"height":288,"width":600} | ||
Version du 5 mai 2022 à 12:05
Tutorial that outlines the steps that make up a typical TcXaeShell development cycle with GIR source control
Difficulté
Difficile
Durée
1 heure(s)
Introduction
These steps outline typical actions that make up a development cycle for changing code on a machine, saving changes locally and to the cloud repository using Git as the Source control tool.
- Tutoriels prérequis
Étape 1 - Making a branch
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:
- 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.
Draft
Français
English
Deutsch
Español
Italiano
Português