| [version en cours de rédaction] | [version en cours de rédaction] |
| Ligne 57 : | Ligne 57 : | ||
|Step_Content=<translate>'''This is the main screen for the version control commands'''</translate> | |Step_Content=<translate>'''This is the main screen for the version control commands'''</translate> | ||
|Step_Picture_00=Team_Explorer_Home_001.png | |Step_Picture_00=Team_Explorer_Home_001.png | ||
| + | }} | ||
| + | {{Tuto Step | ||
| + | |Step_Title=<translate>Branches</translate> | ||
| + | |Step_Content=<translate>Select the Branches option</translate> | ||
| + | |Step_Picture_00=Selecting_Branches_001.png | ||
| + | }} | ||
| + | {{Tuto Step | ||
| + | |Step_Title=<translate>Branches Detail</translate> | ||
| + | |Step_Content=<translate>This panel now shows the Branches Available | ||
| + | |||
| + | # The '''master''' branch this is the main copy of the program in the local folders. | ||
| + | # The '''remote/origin''' this is the remote repository</translate> | ||
| + | |Step_Picture_00=Branches_Available_001.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":402,"height":276,"fill":"rgb(0,0,0)","stroke":null,"strokeWidth":0,"strokeDashArray":null,"strokeLineCap":"butt","strokeDashOffset":0,"strokeLineJoin":"miter","strokeMiterLimit":4,"scaleX":1.49,"scaleY":1.49,"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/4/47/Branches_Available_001.png","filters":[]},{"type":"wfarrow2line","version":"2.4.6","originX":"center","originY":"center","left":242,"top":265.01,"width":126,"height":42,"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":63,"x2":-63,"y1":-21.00058022037412,"y2":21.00058022037412,"x2a":-41.49650142694882,"y2a":22.26531304543472,"x2b":-46.55627149878321,"y2b":7.086422215727532},{"type":"wfarrow2circle","version":"2.4.6","originX":"center","originY":"center","left":305,"top":244.01,"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":179,"top":286.01,"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":"wfarrow2line","version":"2.4.6","originX":"center","originY":"center","left":269,"top":336.51,"width":80,"height":29,"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":40,"x2":-40,"y1":14.50040062835356,"y2":-14.50040062835356,"x2a":-23.92380020407702,"y2a":-0.1631833208853566,"x2b":-18.470877866767353,"y2b":-15.205312092547608},{"type":"wfarrow2circle","version":"2.4.6","originX":"center","originY":"center","left":309,"top":351.01,"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":229,"top":322.01,"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":"textbox","version":"2.4.6","originX":"center","originY":"center","left":347,"top":243,"width":47.8,"height":22.6,"fill":"#FF0000","stroke":"#FF0000","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":20,"fontWeight":"normal","fontFamily":"sans-serif","fontStyle":"normal","lineHeight":1.16,"underline":false,"overline":false,"linethrough":false,"textAlign":"left","textBackgroundColor":"","charSpacing":0,"minWidth":20,"styles":{} },{"type":"textbox","version":"2.4.6","originX":"center","originY":"center","left":352,"top":350.01,"width":47.8,"height":22.6,"fill":"#FF0000","stroke":"#FF0000","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":"2","fontSize":20,"fontWeight":"normal","fontFamily":"sans-serif","fontStyle":"normal","lineHeight":1.16,"underline":false,"overline":false,"linethrough":false,"textAlign":"left","textBackgroundColor":"","charSpacing":0,"minWidth":20,"styles":{} }],"height":412,"width":600} | ||
}} | }} | ||
{{Notes}} | {{Notes}} | ||
Version du 3 mai 2022 à 13:19
How to create a Development Branch within the TwinCAT3 source control
Difficulté
Facile
Durée
5 minute(s)
Introduction
Branching is a means of diverging from your main line of development and allows you to continue to do work without affecting the main line of code.
This is used when you want to try out or develop some alternative code but want to have the ability to switch back to the original code if necessary.
These instructions give details of how you create a branch within the Beckhoff TwinCAT Xae Shell program.
These instructions start from a point where the project has been created and PLC code has been loaded in to the TwinCAT Xae Shell program,- Pièces et outils
- Tutoriels prérequis
Pièces et outils
[[Item:|]] A fatal error occurred in the #info parser function
Tutoriels prérequis
Étape 1 - Open Team Explorer
Select View
From the Drop-down menu select Team Explorer
Étape 2 - Manage Connections
Select Connections Icon
Étape 3 - Add Repository
1 Select the Add Option
2. Enter the path of the source folder for your project
3. Press Add button to add the repository
Étape 4 - Select Repository
he Repository has been added
1. Select Connections Icon by
selecting the red square to show the project.
Étape 5 - Team Explorer Home Screen
This is the main screen for the version control commands
Étape 6 - Branches
Select the Branches option
Étape 7 - Branches Detail
This panel now shows the Branches Available
- The master branch this is the main copy of the program in the local folders.
- The remote/origin this is the remote repository
Draft
Français
English
Deutsch
Español
Italiano
Português