@atlashub/smartstack-cli 1.14.0 → 1.14.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.documentation/gitflow.html +541 -378
- package/.documentation/installation.html +114 -39
- package/config/default-config.json +10 -1
- package/package.json +1 -1
- package/templates/agents/efcore/migration.md +4 -4
- package/templates/commands/efcore/_shared.md +1 -1
- package/templates/commands/efcore/migration.md +1 -1
- package/templates/commands/efcore/rebase-snapshot.md +1 -1
- package/templates/commands/efcore/squash.md +1 -0
- package/templates/skills/_shared.md +29 -6
- package/templates/skills/apex/SKILL.md +56 -0
- package/templates/skills/apex/steps/step-01-analyze.md +22 -5
- package/templates/skills/apex/steps/step-04-validate.md +32 -6
- package/templates/skills/gitflow/steps/step-start.md +109 -9
- package/templates/skills/ui-components/SKILL.md +167 -5
- package/templates/commands/gitflow/OPTIMIZATIONS.md +0 -206
- package/templates/gitflow/config.json +0 -138
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
<header class="global-header">
|
|
13
13
|
<div class="logo">SS</div>
|
|
14
14
|
<span class="site-title">SmartStack CLI</span>
|
|
15
|
-
<span class="version-badge">v1.14.
|
|
15
|
+
<span class="version-badge">v1.14.1</span>
|
|
16
16
|
<div class="header-divider"></div>
|
|
17
17
|
<span class="page-title">GitFlow Workflow</span>
|
|
18
18
|
<nav class="breadcrumb">
|
|
@@ -82,6 +82,7 @@
|
|
|
82
82
|
</a>
|
|
83
83
|
<nav class="sidebar-toc">
|
|
84
84
|
<a href="#introduction" class="sidebar-toc-link">Introduction</a>
|
|
85
|
+
<a href="#quick-start" class="sidebar-toc-link">Quick Start</a>
|
|
85
86
|
<a href="#concepts" class="sidebar-toc-link">
|
|
86
87
|
<span data-lang="fr">Concepts cles</span>
|
|
87
88
|
<span data-lang="en">Key Concepts</span>
|
|
@@ -186,6 +187,174 @@
|
|
|
186
187
|
</div>
|
|
187
188
|
</section>
|
|
188
189
|
|
|
190
|
+
<!-- Quick Start -->
|
|
191
|
+
<section id="quick-start">
|
|
192
|
+
<h2>Quick Start</h2>
|
|
193
|
+
|
|
194
|
+
<div class="alert alert-info">
|
|
195
|
+
<span class="alert-icon">🚀</span>
|
|
196
|
+
<div class="alert-content">
|
|
197
|
+
<h5 data-lang="fr">Commandes essentielles</h5>
|
|
198
|
+
<h5 data-lang="en">Essential Commands</h5>
|
|
199
|
+
<p data-lang="fr">Les commandes les plus utilisees pour demarrer rapidement.</p>
|
|
200
|
+
<p data-lang="en">The most commonly used commands to get started quickly.</p>
|
|
201
|
+
</div>
|
|
202
|
+
</div>
|
|
203
|
+
|
|
204
|
+
<div class="table-container">
|
|
205
|
+
<table>
|
|
206
|
+
<thead>
|
|
207
|
+
<tr>
|
|
208
|
+
<th>
|
|
209
|
+
<span data-lang="fr">Action</span>
|
|
210
|
+
<span data-lang="en">Action</span>
|
|
211
|
+
</th>
|
|
212
|
+
<th>
|
|
213
|
+
<span data-lang="fr">Commande</span>
|
|
214
|
+
<span data-lang="en">Command</span>
|
|
215
|
+
</th>
|
|
216
|
+
<th>
|
|
217
|
+
<span data-lang="fr">Raccourci</span>
|
|
218
|
+
<span data-lang="en">Shorthand</span>
|
|
219
|
+
</th>
|
|
220
|
+
</tr>
|
|
221
|
+
</thead>
|
|
222
|
+
<tbody>
|
|
223
|
+
<tr>
|
|
224
|
+
<td>
|
|
225
|
+
<span data-lang="fr">Demarrer feature</span>
|
|
226
|
+
<span data-lang="en">Start feature</span>
|
|
227
|
+
</td>
|
|
228
|
+
<td><code>/gitflow start feature xxx</code></td>
|
|
229
|
+
<td><code>/gitflow -f xxx</code></td>
|
|
230
|
+
</tr>
|
|
231
|
+
<tr>
|
|
232
|
+
<td>
|
|
233
|
+
<span data-lang="fr">Demarrer release</span>
|
|
234
|
+
<span data-lang="en">Start release</span>
|
|
235
|
+
</td>
|
|
236
|
+
<td><code>/gitflow start release 2.0.0</code></td>
|
|
237
|
+
<td><code>/gitflow -r 2.0.0</code></td>
|
|
238
|
+
</tr>
|
|
239
|
+
<tr>
|
|
240
|
+
<td>
|
|
241
|
+
<span data-lang="fr">Demarrer hotfix</span>
|
|
242
|
+
<span data-lang="en">Start hotfix</span>
|
|
243
|
+
</td>
|
|
244
|
+
<td><code>/gitflow start hotfix xxx</code></td>
|
|
245
|
+
<td><code>/gitflow -h xxx</code></td>
|
|
246
|
+
</tr>
|
|
247
|
+
<tr>
|
|
248
|
+
<td>Commit</td>
|
|
249
|
+
<td><code>/gitflow commit</code></td>
|
|
250
|
+
<td><code>/gitflow -a commit "msg"</code></td>
|
|
251
|
+
</tr>
|
|
252
|
+
<tr>
|
|
253
|
+
<td>
|
|
254
|
+
<span data-lang="fr">Creer PR</span>
|
|
255
|
+
<span data-lang="en">Create PR</span>
|
|
256
|
+
</td>
|
|
257
|
+
<td><code>/gitflow pr</code></td>
|
|
258
|
+
<td>-</td>
|
|
259
|
+
</tr>
|
|
260
|
+
<tr>
|
|
261
|
+
<td>Merge</td>
|
|
262
|
+
<td><code>/gitflow merge</code></td>
|
|
263
|
+
<td>-</td>
|
|
264
|
+
</tr>
|
|
265
|
+
<tr>
|
|
266
|
+
<td>
|
|
267
|
+
<span data-lang="fr">Finaliser</span>
|
|
268
|
+
<span data-lang="en">Finish</span>
|
|
269
|
+
</td>
|
|
270
|
+
<td><code>/gitflow finish</code></td>
|
|
271
|
+
<td>-</td>
|
|
272
|
+
</tr>
|
|
273
|
+
<tr>
|
|
274
|
+
<td>Status</td>
|
|
275
|
+
<td><code>/gitflow status</code></td>
|
|
276
|
+
<td><code>/gitflow -s</code></td>
|
|
277
|
+
</tr>
|
|
278
|
+
</tbody>
|
|
279
|
+
</table>
|
|
280
|
+
</div>
|
|
281
|
+
|
|
282
|
+
<h3>
|
|
283
|
+
<span data-lang="fr">Flags disponibles</span>
|
|
284
|
+
<span data-lang="en">Available Flags</span>
|
|
285
|
+
</h3>
|
|
286
|
+
|
|
287
|
+
<div class="table-container">
|
|
288
|
+
<table>
|
|
289
|
+
<thead>
|
|
290
|
+
<tr>
|
|
291
|
+
<th>Flag</th>
|
|
292
|
+
<th>Long</th>
|
|
293
|
+
<th>Description</th>
|
|
294
|
+
</tr>
|
|
295
|
+
</thead>
|
|
296
|
+
<tbody>
|
|
297
|
+
<tr>
|
|
298
|
+
<td><code>-f</code></td>
|
|
299
|
+
<td><code>--feature</code></td>
|
|
300
|
+
<td>
|
|
301
|
+
<span data-lang="fr">Workflow feature (cible: develop)</span>
|
|
302
|
+
<span data-lang="en">Feature workflow (target: develop)</span>
|
|
303
|
+
</td>
|
|
304
|
+
</tr>
|
|
305
|
+
<tr>
|
|
306
|
+
<td><code>-r</code></td>
|
|
307
|
+
<td><code>--release</code></td>
|
|
308
|
+
<td>
|
|
309
|
+
<span data-lang="fr">Workflow release (cible: main, merge-back develop)</span>
|
|
310
|
+
<span data-lang="en">Release workflow (target: main, merge-back develop)</span>
|
|
311
|
+
</td>
|
|
312
|
+
</tr>
|
|
313
|
+
<tr>
|
|
314
|
+
<td><code>-h</code></td>
|
|
315
|
+
<td><code>--hotfix</code></td>
|
|
316
|
+
<td>
|
|
317
|
+
<span data-lang="fr">Workflow hotfix (cible: main, merge-back develop)</span>
|
|
318
|
+
<span data-lang="en">Hotfix workflow (target: main, merge-back develop)</span>
|
|
319
|
+
</td>
|
|
320
|
+
</tr>
|
|
321
|
+
<tr>
|
|
322
|
+
<td><code>-a</code></td>
|
|
323
|
+
<td><code>--auto</code></td>
|
|
324
|
+
<td>
|
|
325
|
+
<span data-lang="fr">Mode autonome: sauter les confirmations</span>
|
|
326
|
+
<span data-lang="en">Autonomous mode: skip confirmations</span>
|
|
327
|
+
</td>
|
|
328
|
+
</tr>
|
|
329
|
+
<tr>
|
|
330
|
+
<td><code>-s</code></td>
|
|
331
|
+
<td><code>--status</code></td>
|
|
332
|
+
<td>
|
|
333
|
+
<span data-lang="fr">Mode status: afficher l'etat uniquement</span>
|
|
334
|
+
<span data-lang="en">Status mode: show state only</span>
|
|
335
|
+
</td>
|
|
336
|
+
</tr>
|
|
337
|
+
<tr>
|
|
338
|
+
<td><code>-v</code></td>
|
|
339
|
+
<td><code>--verbose</code></td>
|
|
340
|
+
<td>
|
|
341
|
+
<span data-lang="fr">Sortie detaillee</span>
|
|
342
|
+
<span data-lang="en">Verbose output</span>
|
|
343
|
+
</td>
|
|
344
|
+
</tr>
|
|
345
|
+
<tr>
|
|
346
|
+
<td><code></code></td>
|
|
347
|
+
<td><code>--dry-run</code></td>
|
|
348
|
+
<td>
|
|
349
|
+
<span data-lang="fr">Previsualiser sans executer</span>
|
|
350
|
+
<span data-lang="en">Preview actions without executing</span>
|
|
351
|
+
</td>
|
|
352
|
+
</tr>
|
|
353
|
+
</tbody>
|
|
354
|
+
</table>
|
|
355
|
+
</div>
|
|
356
|
+
</section>
|
|
357
|
+
|
|
189
358
|
<!-- Key Concepts -->
|
|
190
359
|
<section id="concepts">
|
|
191
360
|
<h2>
|
|
@@ -390,7 +559,7 @@
|
|
|
390
559
|
<div class="tooltip-cmd"></div>
|
|
391
560
|
</div>
|
|
392
561
|
|
|
393
|
-
<svg viewBox="0 0 900 320" xmlns="http://www.w3.org/2000/svg" style="font-family: 'Inter', system-ui, sans-serif;">
|
|
562
|
+
<svg viewBox="0 0 900 320" xmlns="http://www.w3.org/2000/svg" style="font-family: 'Inter', system-ui, sans-serif; width: 100%; max-width: 1800px; height: auto; display: block; margin: 0 auto;">
|
|
394
563
|
<!-- Definitions -->
|
|
395
564
|
<defs>
|
|
396
565
|
<marker id="arrow" markerWidth="10" markerHeight="10" refX="9" refY="3" orient="auto" markerUnits="strokeWidth">
|
|
@@ -419,7 +588,7 @@
|
|
|
419
588
|
data-title-en="Main branch (production)"
|
|
420
589
|
data-desc-fr="Branche protegee contenant le code en production. Chaque commit represente une version deployee. Jamais de push direct - uniquement via release ou hotfix."
|
|
421
590
|
data-desc-en="Protected branch containing production code. Each commit represents a deployed version. Never push directly - only via release or hotfix."
|
|
422
|
-
data-cmd="/gitflow
|
|
591
|
+
data-cmd="/gitflow status">
|
|
423
592
|
<text x="30" y="55" fill="#ef4444" font-weight="600" font-size="14">main</text>
|
|
424
593
|
<line x1="100" y1="50" x2="850" y2="50" stroke="#ef4444" stroke-width="3" stroke-linecap="round"/>
|
|
425
594
|
<!-- Invisible hit area -->
|
|
@@ -432,7 +601,7 @@
|
|
|
432
601
|
data-title-en="Develop branch (integration)"
|
|
433
602
|
data-desc-fr="Branche d'integration recevant toutes les features terminees. Base pour les nouvelles features et releases. Doit toujours etre stable."
|
|
434
603
|
data-desc-en="Integration branch receiving all completed features. Base for new features and releases. Must always be stable."
|
|
435
|
-
data-cmd="/gitflow
|
|
604
|
+
data-cmd="/gitflow status">
|
|
436
605
|
<text x="30" y="175" fill="#f97316" font-weight="600" font-size="14">develop</text>
|
|
437
606
|
<line x1="100" y1="170" x2="850" y2="170" stroke="#f97316" stroke-width="3" stroke-linecap="round"/>
|
|
438
607
|
<rect x="25" y="155" width="830" height="30" fill="transparent" class="hit-area"/>
|
|
@@ -444,7 +613,7 @@
|
|
|
444
613
|
data-title-en="Release line"
|
|
445
614
|
data-desc-fr="Zone de preparation des releases avant deploiement. Permet de finaliser une version sans bloquer le developpement."
|
|
446
615
|
data-desc-en="Release preparation zone before deployment. Allows finalizing a version without blocking development."
|
|
447
|
-
data-cmd="/gitflow
|
|
616
|
+
data-cmd="/gitflow start release">
|
|
448
617
|
<text x="30" y="115" fill="#eab308" font-weight="600" font-size="14">release</text>
|
|
449
618
|
<rect x="25" y="100" width="60" height="25" fill="transparent" class="hit-area"/>
|
|
450
619
|
</g>
|
|
@@ -455,7 +624,7 @@
|
|
|
455
624
|
data-title-en="Feature line"
|
|
456
625
|
data-desc-fr="Zone de developpement des nouvelles fonctionnalites. Chaque feature a sa branche creee depuis develop."
|
|
457
626
|
data-desc-en="Development zone for new features. Each feature has its branch created from develop."
|
|
458
|
-
data-cmd="/gitflow
|
|
627
|
+
data-cmd="/gitflow start feature {nom}">
|
|
459
628
|
<text x="30" y="235" fill="#22c55e" font-weight="600" font-size="14">feature</text>
|
|
460
629
|
<rect x="25" y="220" width="60" height="25" fill="transparent" class="hit-area"/>
|
|
461
630
|
</g>
|
|
@@ -466,7 +635,7 @@
|
|
|
466
635
|
data-title-en="Hotfix line"
|
|
467
636
|
data-desc-fr="Zone pour les corrections urgentes en production. Creee depuis main, mergee dans main ET develop."
|
|
468
637
|
data-desc-en="Zone for urgent production fixes. Created from main, merged into main AND develop."
|
|
469
|
-
data-cmd="/gitflow
|
|
638
|
+
data-cmd="/gitflow start hotfix {nom}">
|
|
470
639
|
<text x="30" y="295" fill="#ec4899" font-weight="600" font-size="14">hotfix</text>
|
|
471
640
|
<rect x="25" y="280" width="60" height="25" fill="transparent" class="hit-area"/>
|
|
472
641
|
</g>
|
|
@@ -477,7 +646,7 @@
|
|
|
477
646
|
data-title-en="Feature A"
|
|
478
647
|
data-desc-fr="Branche de developpement d'une fonctionnalite. Contient plusieurs commits de travail avant d'etre mergee dans develop."
|
|
479
648
|
data-desc-en="Feature development branch. Contains multiple work commits before being merged into develop."
|
|
480
|
-
data-cmd="/gitflow
|
|
649
|
+
data-cmd="/gitflow start feature {nom}">
|
|
481
650
|
<path d="M 200 170 Q 200 210 230 230 L 330 230 Q 360 210 360 170" stroke="#22c55e" stroke-width="3" fill="none" stroke-linecap="round"/>
|
|
482
651
|
<text x="260" y="260" fill="#94a3b8" font-size="11">feature/a</text>
|
|
483
652
|
<circle cx="260" cy="230" r="6" fill="#22c55e"/>
|
|
@@ -491,7 +660,7 @@
|
|
|
491
660
|
data-title-en="Feature B"
|
|
492
661
|
data-desc-fr="Deuxieme feature en parallele. Les features peuvent etre developpees simultanement par differents developpeurs sans conflit."
|
|
493
662
|
data-desc-en="Second feature in parallel. Features can be developed simultaneously by different developers without conflict."
|
|
494
|
-
data-cmd="/gitflow
|
|
663
|
+
data-cmd="/gitflow start feature {nom}">
|
|
495
664
|
<path d="M 420 170 Q 420 210 450 230 L 550 230 Q 580 210 580 170" stroke="#22c55e" stroke-width="3" fill="none" stroke-linecap="round"/>
|
|
496
665
|
<text x="480" y="260" fill="#94a3b8" font-size="11">feature/b</text>
|
|
497
666
|
<circle cx="480" cy="230" r="6" fill="#22c55e"/>
|
|
@@ -505,7 +674,7 @@
|
|
|
505
674
|
data-title-en="Release branch v1.0"
|
|
506
675
|
data-desc-fr="Preparation de la version 1.0. Permet les derniers ajustements (bugfix, doc) avant deploiement en production."
|
|
507
676
|
data-desc-en="Preparation of version 1.0. Allows final adjustments (bugfix, docs) before production deployment."
|
|
508
|
-
data-cmd="/gitflow
|
|
677
|
+
data-cmd="/gitflow start release">
|
|
509
678
|
<path d="M 400 170 Q 400 140 430 110 L 550 110 Q 570 80 600 50" stroke="#eab308" stroke-width="3" fill="none" stroke-linecap="round"/>
|
|
510
679
|
<text x="470" y="95" fill="#94a3b8" font-size="11">release/v1.0</text>
|
|
511
680
|
<circle cx="500" cy="110" r="6" fill="#eab308"/>
|
|
@@ -518,7 +687,7 @@
|
|
|
518
687
|
data-title-en="Merge back release → develop"
|
|
519
688
|
data-desc-fr="Synchronisation de la release vers develop. Apres merge dans main, les changements doivent aussi aller dans develop."
|
|
520
689
|
data-desc-en="Sync release to develop. After merging into main, changes must also go into develop."
|
|
521
|
-
data-cmd="/gitflow
|
|
690
|
+
data-cmd="/gitflow finish">
|
|
522
691
|
<path d="M 600 50 L 600 170" stroke="#eab308" stroke-width="2" stroke-dasharray="5,5" fill="none"/>
|
|
523
692
|
<rect x="590" y="45" width="20" height="130" fill="transparent" class="hit-area"/>
|
|
524
693
|
</g>
|
|
@@ -529,7 +698,7 @@
|
|
|
529
698
|
data-title-en="Hotfix branch bug"
|
|
530
699
|
data-desc-fr="Correction urgente d'un bug en production. Increment automatique du PATCH (1.0.0 → 1.0.1)."
|
|
531
700
|
data-desc-en="Urgent fix for a production bug. Automatic PATCH increment (1.0.0 → 1.0.1)."
|
|
532
|
-
data-cmd="/gitflow
|
|
701
|
+
data-cmd="/gitflow start hotfix {nom}">
|
|
533
702
|
<path d="M 700 50 Q 700 170 720 290 L 780 290 Q 800 170 800 50" stroke="#ec4899" stroke-width="3" fill="none" stroke-linecap="round"/>
|
|
534
703
|
<text x="720" y="310" fill="#94a3b8" font-size="11">hotfix/bug</text>
|
|
535
704
|
<circle cx="750" cy="290" r="6" fill="#ec4899"/>
|
|
@@ -542,7 +711,7 @@
|
|
|
542
711
|
data-title-en="Merge back hotfix → develop"
|
|
543
712
|
data-desc-fr="Synchronisation du hotfix vers develop. CRITIQUE pour eviter de regresser dans les futures versions."
|
|
544
713
|
data-desc-en="Sync hotfix to develop. CRITICAL to avoid regression in future versions."
|
|
545
|
-
data-cmd="/gitflow
|
|
714
|
+
data-cmd="/gitflow finish">
|
|
546
715
|
<path d="M 780 290 L 820 170" stroke="#ec4899" stroke-width="2" stroke-dasharray="4,3"/>
|
|
547
716
|
<rect x="775" y="165" width="55" height="135" fill="transparent" class="hit-area"/>
|
|
548
717
|
</g>
|
|
@@ -553,7 +722,7 @@
|
|
|
553
722
|
data-title-en="Commit on main"
|
|
554
723
|
data-desc-fr="Commit sur main. Les commits viennent uniquement des merges de release ou hotfix, jamais de push direct."
|
|
555
724
|
data-desc-en="Commit on main. Commits only come from release or hotfix merges, never from direct push."
|
|
556
|
-
data-cmd="/gitflow
|
|
725
|
+
data-cmd="/gitflow commit">
|
|
557
726
|
<circle cx="150" cy="50" r="8" fill="#ef4444" filter="url(#glow)"/>
|
|
558
727
|
<rect x="140" y="38" width="20" height="24" fill="transparent" class="hit-area"/>
|
|
559
728
|
</g>
|
|
@@ -564,7 +733,7 @@
|
|
|
564
733
|
data-title-en="Merge release → main"
|
|
565
734
|
data-desc-fr="Commit de merge de la release dans main. La bordure jaune = source release. Tag v1.0 cree automatiquement."
|
|
566
735
|
data-desc-en="Release merge commit into main. Yellow border = release source. Tag v1.0 automatically created."
|
|
567
|
-
data-cmd="/gitflow
|
|
736
|
+
data-cmd="/gitflow finish">
|
|
568
737
|
<circle cx="600" cy="50" r="10" fill="#ef4444" stroke="#eab308" stroke-width="3" filter="url(#glow)"/>
|
|
569
738
|
<rect x="588" y="38" width="24" height="24" fill="transparent" class="hit-area"/>
|
|
570
739
|
</g>
|
|
@@ -575,7 +744,7 @@
|
|
|
575
744
|
data-title-en="Merge hotfix → main"
|
|
576
745
|
data-desc-fr="Commit de merge du hotfix dans main. La bordure rose = source hotfix. Tag v1.0.1 (patch) cree automatiquement."
|
|
577
746
|
data-desc-en="Hotfix merge commit into main. Pink border = hotfix source. Tag v1.0.1 (patch) automatically created."
|
|
578
|
-
data-cmd="/gitflow
|
|
747
|
+
data-cmd="/gitflow finish">
|
|
579
748
|
<circle cx="800" cy="50" r="10" fill="#ef4444" stroke="#ec4899" stroke-width="3" filter="url(#glow)"/>
|
|
580
749
|
<rect x="788" y="38" width="24" height="24" fill="transparent" class="hit-area"/>
|
|
581
750
|
</g>
|
|
@@ -586,7 +755,7 @@
|
|
|
586
755
|
data-title-en="Tag v1.0"
|
|
587
756
|
data-desc-fr="Tag Git marquant cette version en production. Cree automatiquement lors du finish. Format: v{MAJOR}.{MINOR}.{PATCH}"
|
|
588
757
|
data-desc-en="Git tag marking this version in production. Automatically created on finish. Format: v{MAJOR}.{MINOR}.{PATCH}"
|
|
589
|
-
data-cmd="/gitflow
|
|
758
|
+
data-cmd="/gitflow finish">
|
|
590
759
|
<g transform="translate(600, 20)">
|
|
591
760
|
<rect x="-20" y="-12" width="40" height="18" rx="4" fill="#eab308"/>
|
|
592
761
|
<text x="0" y="2" fill="#0f172a" font-size="10" font-weight="600" text-anchor="middle">v1.0</text>
|
|
@@ -600,7 +769,7 @@
|
|
|
600
769
|
data-title-en="Tag v1.0.1 (patch)"
|
|
601
770
|
data-desc-fr="Tag de version patch cree par le hotfix. Increment automatique: 1.0.0 → 1.0.1. Correction sans nouvelles features."
|
|
602
771
|
data-desc-en="Patch version tag created by hotfix. Automatic increment: 1.0.0 → 1.0.1. Fix without new features."
|
|
603
|
-
data-cmd="/gitflow
|
|
772
|
+
data-cmd="/gitflow finish">
|
|
604
773
|
<g transform="translate(800, 20)">
|
|
605
774
|
<rect x="-24" y="-12" width="48" height="18" rx="4" fill="#ec4899"/>
|
|
606
775
|
<text x="0" y="2" fill="#0f172a" font-size="10" font-weight="600" text-anchor="middle">v1.0.1</text>
|
|
@@ -614,7 +783,7 @@
|
|
|
614
783
|
data-title-en="Merge feature/a → develop"
|
|
615
784
|
data-desc-fr="Commit de merge de la feature A dans develop. La bordure verte = merge de feature."
|
|
616
785
|
data-desc-en="Feature A merge commit into develop. Green border = feature merge."
|
|
617
|
-
data-cmd="/gitflow
|
|
786
|
+
data-cmd="/gitflow merge">
|
|
618
787
|
<circle cx="360" cy="170" r="8" fill="#f97316" stroke="#22c55e" stroke-width="2"/>
|
|
619
788
|
<rect x="350" y="160" width="20" height="20" fill="transparent" class="hit-area"/>
|
|
620
789
|
</g>
|
|
@@ -625,7 +794,7 @@
|
|
|
625
794
|
data-title-en="Merge feature/b → develop"
|
|
626
795
|
data-desc-fr="Commit de merge de la feature B dans develop. Plusieurs features peuvent etre mergees independamment."
|
|
627
796
|
data-desc-en="Feature B merge commit into develop. Multiple features can be merged independently."
|
|
628
|
-
data-cmd="/gitflow
|
|
797
|
+
data-cmd="/gitflow merge">
|
|
629
798
|
<circle cx="580" cy="170" r="8" fill="#f97316" stroke="#22c55e" stroke-width="2"/>
|
|
630
799
|
<rect x="570" y="160" width="20" height="20" fill="transparent" class="hit-area"/>
|
|
631
800
|
</g>
|
|
@@ -636,7 +805,7 @@
|
|
|
636
805
|
data-title-en="Merge back release → develop"
|
|
637
806
|
data-desc-fr="Commit de synchronisation de la release vers develop. Les bugfix sont integres dans develop."
|
|
638
807
|
data-desc-en="Release sync commit to develop. Bugfixes are integrated into develop."
|
|
639
|
-
data-cmd="/gitflow
|
|
808
|
+
data-cmd="/gitflow finish">
|
|
640
809
|
<circle cx="600" cy="170" r="8" fill="#f97316" stroke="#eab308" stroke-width="2"/>
|
|
641
810
|
<rect x="590" y="160" width="20" height="20" fill="transparent" class="hit-area"/>
|
|
642
811
|
</g>
|
|
@@ -647,7 +816,7 @@
|
|
|
647
816
|
data-title-en="Merge back hotfix → develop"
|
|
648
817
|
data-desc-fr="Commit de synchronisation du hotfix vers develop. ESSENTIEL pour eviter regression."
|
|
649
818
|
data-desc-en="Hotfix sync commit to develop. ESSENTIAL to avoid regression."
|
|
650
|
-
data-cmd="/gitflow
|
|
819
|
+
data-cmd="/gitflow finish">
|
|
651
820
|
<circle cx="820" cy="170" r="8" fill="#f97316" stroke="#ec4899" stroke-width="2"/>
|
|
652
821
|
<rect x="810" y="160" width="20" height="20" fill="transparent" class="hit-area"/>
|
|
653
822
|
</g>
|
|
@@ -663,7 +832,7 @@
|
|
|
663
832
|
data-title-en="Merge arrow"
|
|
664
833
|
data-desc-fr="Direction du merge: de la feature vers develop. Utilise --no-ff pour preserver l'historique."
|
|
665
834
|
data-desc-en="Merge direction: from feature to develop. Uses --no-ff to preserve history."
|
|
666
|
-
data-cmd="/gitflow
|
|
835
|
+
data-cmd="/gitflow merge">
|
|
667
836
|
<path d="M 360 230 L 360 178" stroke="#22c55e" stroke-width="2" marker-end="url(#arrow)"/>
|
|
668
837
|
<path d="M 580 230 L 580 178" stroke="#22c55e" stroke-width="2" marker-end="url(#arrow)"/>
|
|
669
838
|
<rect x="355" y="175" width="10" height="60" fill="transparent" class="hit-area"/>
|
|
@@ -812,13 +981,13 @@
|
|
|
812
981
|
<h5 data-lang="fr">Deux methodes d'integration</h5>
|
|
813
982
|
<h5 data-lang="en">Two Integration Methods</h5>
|
|
814
983
|
<div data-lang="fr">
|
|
815
|
-
<p><strong>1. Methode PR (Recommandee)</strong> : <code>/gitflow
|
|
984
|
+
<p><strong>1. Methode PR (Recommandee)</strong> : <code>/gitflow pr</code> → <code>/gitflow finish</code></p>
|
|
816
985
|
<ul style="margin: 0.5rem 0; padding-left: 1.5rem;">
|
|
817
986
|
<li>Cree une Pull Request pour revue de code</li>
|
|
818
|
-
<li>Apres merge de la PR, <code>/gitflow
|
|
987
|
+
<li>Apres merge de la PR, <code>/gitflow finish</code> supprime la branche locale ET remote</li>
|
|
819
988
|
<li><strong>A utiliser pour</strong> : features, releases, hotfixes</li>
|
|
820
989
|
</ul>
|
|
821
|
-
<p style="margin-top: 1rem;"><strong>2. Methode directe (Legacy)</strong> : <code>/gitflow
|
|
990
|
+
<p style="margin-top: 1rem;"><strong>2. Methode directe (Legacy)</strong> : <code>/gitflow plan</code> → <code>/gitflow merge</code></p>
|
|
822
991
|
<ul style="margin: 0.5rem 0; padding-left: 1.5rem;">
|
|
823
992
|
<li>Merge directement sans Pull Request</li>
|
|
824
993
|
<li>Utile pour les projets solo ou CI/CD automatise</li>
|
|
@@ -826,13 +995,13 @@
|
|
|
826
995
|
</ul>
|
|
827
996
|
</div>
|
|
828
997
|
<div data-lang="en">
|
|
829
|
-
<p><strong>1. PR Method (Recommended)</strong>: <code>/gitflow
|
|
998
|
+
<p><strong>1. PR Method (Recommended)</strong>: <code>/gitflow pr</code> → <code>/gitflow finish</code></p>
|
|
830
999
|
<ul style="margin: 0.5rem 0; padding-left: 1.5rem;">
|
|
831
1000
|
<li>Creates a Pull Request for code review</li>
|
|
832
|
-
<li>After PR merge, <code>/gitflow
|
|
1001
|
+
<li>After PR merge, <code>/gitflow finish</code> deletes both local AND remote branches</li>
|
|
833
1002
|
<li><strong>Use for</strong>: features, releases, hotfixes</li>
|
|
834
1003
|
</ul>
|
|
835
|
-
<p style="margin-top: 1rem;"><strong>2. Direct Method (Legacy)</strong>: <code>/gitflow
|
|
1004
|
+
<p style="margin-top: 1rem;"><strong>2. Direct Method (Legacy)</strong>: <code>/gitflow plan</code> → <code>/gitflow merge</code></p>
|
|
836
1005
|
<ul style="margin: 0.5rem 0; padding-left: 1.5rem;">
|
|
837
1006
|
<li>Merges directly without Pull Request</li>
|
|
838
1007
|
<li>Useful for solo projects or automated CI/CD</li>
|
|
@@ -849,21 +1018,21 @@
|
|
|
849
1018
|
<h5 data-lang="fr">Suppression des branches remote</h5>
|
|
850
1019
|
<h5 data-lang="en">Remote Branch Deletion</h5>
|
|
851
1020
|
<p data-lang="fr">
|
|
852
|
-
<code>/gitflow
|
|
853
|
-
Pour un nettoyage complet des worktrees orphelins, utilisez <code>/gitflow
|
|
1021
|
+
<code>/gitflow finish</code> supprime automatiquement la branche sur le remote (<code>git push origin --delete {branch}</code>).
|
|
1022
|
+
Pour un nettoyage complet des worktrees orphelins, utilisez <code>/gitflow cleanup</code>.
|
|
854
1023
|
</p>
|
|
855
1024
|
<p data-lang="en">
|
|
856
|
-
<code>/gitflow
|
|
857
|
-
For complete cleanup of orphan worktrees, use <code>/gitflow
|
|
1025
|
+
<code>/gitflow finish</code> automatically deletes the remote branch (<code>git push origin --delete {branch}</code>).
|
|
1026
|
+
For complete cleanup of orphan worktrees, use <code>/gitflow cleanup</code>.
|
|
858
1027
|
</p>
|
|
859
1028
|
</div>
|
|
860
1029
|
</div>
|
|
861
1030
|
|
|
862
1031
|
<!-- Decision Flowchart SVG - Responsive -->
|
|
863
1032
|
<div class="decision-diagram" style="margin: 2rem 0;">
|
|
864
|
-
<svg viewBox="0 0 1200
|
|
1033
|
+
<svg viewBox="0 0 1200 900" preserveAspectRatio="xMidYMid meet" style="width: 100%; max-width: 1800px; height: auto; display: block; margin: 0 auto;">
|
|
865
1034
|
<!-- Background -->
|
|
866
|
-
<rect width="1200" height="
|
|
1035
|
+
<rect width="1200" height="900" fill="#0f172a" rx="8"/>
|
|
867
1036
|
|
|
868
1037
|
<!-- Title -->
|
|
869
1038
|
<text x="500" y="40" text-anchor="middle" fill="#f8fafc" font-size="22" font-weight="600">
|
|
@@ -878,111 +1047,105 @@
|
|
|
878
1047
|
<tspan data-lang="en">Goal</tspan>
|
|
879
1048
|
</text>
|
|
880
1049
|
|
|
881
|
-
<!-- FEATURE PATH (Left) -
|
|
882
|
-
<line x1="380" y1="130" x2="
|
|
883
|
-
<
|
|
1050
|
+
<!-- FEATURE PATH (Left) - Simple: left then down -->
|
|
1051
|
+
<line x1="380" y1="130" x2="120" y2="130" stroke="#22c55e" stroke-width="2.5"/>
|
|
1052
|
+
<line x1="120" y1="130" x2="120" y2="250" stroke="#22c55e" stroke-width="2.5"/>
|
|
1053
|
+
<polygon points="120,250 114,236 126,236" fill="#22c55e"/>
|
|
884
1054
|
|
|
885
|
-
<rect x="
|
|
886
|
-
<text x="120" y="
|
|
887
|
-
<tspan data-lang="fr">Nouvelle</tspan>
|
|
888
|
-
<tspan data-lang="en">New</tspan>
|
|
889
|
-
</text>
|
|
890
|
-
<text x="120" y="145" text-anchor="middle" fill="#22c55e" font-size="14" font-weight="600">
|
|
891
|
-
<tspan data-lang="fr">fonctionnalite</tspan>
|
|
892
|
-
<tspan data-lang="en">feature</tspan>
|
|
1055
|
+
<rect x="30" y="255" width="180" height="55" rx="8" fill="#22c55e" fill-opacity="0.15" stroke="#22c55e" stroke-width="2.5"/>
|
|
1056
|
+
<text x="120" y="280" text-anchor="middle" fill="#22c55e" font-size="13" font-weight="600">
|
|
1057
|
+
<tspan data-lang="fr">Nouvelle fonctionnalite</tspan>
|
|
1058
|
+
<tspan data-lang="en">New feature</tspan>
|
|
893
1059
|
</text>
|
|
1060
|
+
<text x="120" y="298" text-anchor="middle" fill="#94a3b8" font-size="10">(feature)</text>
|
|
894
1061
|
|
|
895
1062
|
<!-- Feature flow down -->
|
|
896
|
-
<line x1="120" y1="
|
|
897
|
-
<polygon points="120,
|
|
1063
|
+
<line x1="120" y1="310" x2="120" y2="335" stroke="#22c55e" stroke-width="2.5"/>
|
|
1064
|
+
<polygon points="120,335 114,321 126,321" fill="#22c55e"/>
|
|
898
1065
|
|
|
899
|
-
<g class="cmd-copyable" data-cmd="/gitflow
|
|
900
|
-
<rect x="30" y="
|
|
901
|
-
<text x="120" y="
|
|
902
|
-
<text x="120" y="245" text-anchor="middle" fill="#94a3b8" font-size="10">feature {nom}</text>
|
|
1066
|
+
<g class="cmd-copyable" data-cmd="/gitflow start feature {nom}" style="cursor:pointer;">
|
|
1067
|
+
<rect x="30" y="340" width="180" height="40" rx="6" fill="#0f172a" stroke="#22c55e" stroke-width="2"/>
|
|
1068
|
+
<text x="120" y="365" text-anchor="middle" fill="#22c55e" font-size="11" font-family="monospace">/gitflow start feature</text>
|
|
903
1069
|
</g>
|
|
904
1070
|
|
|
905
|
-
<line x1="120" y1="
|
|
906
|
-
<text x="120" y="
|
|
1071
|
+
<line x1="120" y1="380" x2="120" y2="410" stroke="#22c55e" stroke-width="2.5" stroke-dasharray="5,3"/>
|
|
1072
|
+
<text x="120" y="430" text-anchor="middle" fill="#64748b" font-size="11" font-style="italic">
|
|
907
1073
|
<tspan data-lang="fr">coder...</tspan>
|
|
908
1074
|
<tspan data-lang="en">code...</tspan>
|
|
909
1075
|
</text>
|
|
910
1076
|
|
|
911
1077
|
<!-- Decision: Fini? (Done?) -->
|
|
912
|
-
<line x1="120" y1="
|
|
913
|
-
<polygon points="120,
|
|
914
|
-
<text x="120" y="
|
|
1078
|
+
<line x1="120" y1="445" x2="120" y2="460" stroke="#22c55e" stroke-width="2.5"/>
|
|
1079
|
+
<polygon points="120,505 155,482 120,460 85,482" fill="transparent" stroke="#22c55e" stroke-width="2"/>
|
|
1080
|
+
<text x="120" y="487" text-anchor="middle" fill="#f8fafc" font-size="10" font-weight="500">
|
|
915
1081
|
<tspan data-lang="fr">Fini?</tspan>
|
|
916
1082
|
<tspan data-lang="en">Done?</tspan>
|
|
917
1083
|
</text>
|
|
918
1084
|
|
|
919
1085
|
<!-- NON path - go right to commit -->
|
|
920
|
-
<line x1="
|
|
921
|
-
<polygon points="195,
|
|
922
|
-
<text x="
|
|
1086
|
+
<line x1="155" y1="482" x2="195" y2="482" stroke="#64748b" stroke-width="2.5"/>
|
|
1087
|
+
<polygon points="195,482 182,476 182,488" fill="#64748b"/>
|
|
1088
|
+
<text x="175" y="472" text-anchor="middle" fill="#64748b" font-size="8" font-weight="600">
|
|
923
1089
|
<tspan data-lang="fr">NON</tspan>
|
|
924
1090
|
<tspan data-lang="en">NO</tspan>
|
|
925
1091
|
</text>
|
|
926
1092
|
|
|
927
|
-
<g class="cmd-copyable" data-cmd="/gitflow
|
|
928
|
-
<rect x="198" y="
|
|
929
|
-
<text x="253" y="
|
|
1093
|
+
<g class="cmd-copyable" data-cmd="/gitflow commit" style="cursor:pointer;">
|
|
1094
|
+
<rect x="198" y="465" width="110" height="34" rx="5" fill="#0f172a" stroke="#8b5cf6" stroke-width="2"/>
|
|
1095
|
+
<text x="253" y="487" text-anchor="middle" fill="#8b5cf6" font-size="10" font-family="monospace">/gitflow commit</text>
|
|
930
1096
|
</g>
|
|
931
1097
|
|
|
932
1098
|
<!-- Loop back from commit to coder -->
|
|
933
|
-
<path d="M 253
|
|
934
|
-
<polygon points="160,
|
|
1099
|
+
<path d="M 253 465 L 253 420 L 160 420" stroke="#64748b" stroke-width="2.5" fill="none" stroke-dasharray="5,3"/>
|
|
1100
|
+
<polygon points="160,420 175,414 175,426" fill="#64748b"/>
|
|
935
1101
|
|
|
936
|
-
<!-- OUI path - continue to PR
|
|
937
|
-
<line x1="120" y1="
|
|
938
|
-
<polygon points="120,
|
|
939
|
-
<text x="100" y="
|
|
1102
|
+
<!-- OUI path - continue to PR -->
|
|
1103
|
+
<line x1="120" y1="505" x2="120" y2="530" stroke="#22c55e" stroke-width="2.5"/>
|
|
1104
|
+
<polygon points="120,530 114,516 126,516" fill="#22c55e"/>
|
|
1105
|
+
<text x="100" y="520" text-anchor="end" fill="#22c55e" font-size="9" font-weight="600">
|
|
940
1106
|
<tspan data-lang="fr">OUI</tspan>
|
|
941
1107
|
<tspan data-lang="en">YES</tspan>
|
|
942
1108
|
</text>
|
|
943
1109
|
|
|
944
1110
|
<!-- PR step -->
|
|
945
|
-
<g class="cmd-copyable" data-cmd="/gitflow
|
|
946
|
-
<rect x="30" y="
|
|
947
|
-
<text x="120" y="
|
|
1111
|
+
<g class="cmd-copyable" data-cmd="/gitflow pr" style="cursor:pointer;">
|
|
1112
|
+
<rect x="30" y="535" width="180" height="28" rx="5" fill="#0f172a" stroke="#06b6d4" stroke-width="2"/>
|
|
1113
|
+
<text x="120" y="554" text-anchor="middle" fill="#06b6d4" font-size="9" font-family="monospace">/gitflow pr</text>
|
|
948
1114
|
</g>
|
|
949
1115
|
|
|
950
1116
|
<!-- Arrow to merge on GitHub -->
|
|
951
|
-
<line x1="120" y1="
|
|
952
|
-
<polygon points="120,
|
|
1117
|
+
<line x1="120" y1="563" x2="120" y2="575" stroke="#22c55e" stroke-width="2.5"/>
|
|
1118
|
+
<polygon points="120,575 114,566 126,566" fill="#22c55e"/>
|
|
953
1119
|
|
|
954
1120
|
<!-- Merge on GitHub (external step) -->
|
|
955
|
-
<rect x="30" y="
|
|
956
|
-
<text x="120" y="
|
|
1121
|
+
<rect x="30" y="580" width="180" height="32" rx="5" fill="#334155" fill-opacity="0.5" stroke="#64748b" stroke-width="2" stroke-dasharray="4,2"/>
|
|
1122
|
+
<text x="120" y="594" text-anchor="middle" fill="#94a3b8" font-size="9" font-weight="500">
|
|
957
1123
|
<tspan data-lang="fr">Merge sur GitHub</tspan>
|
|
958
1124
|
<tspan data-lang="en">Merge on GitHub</tspan>
|
|
959
1125
|
</text>
|
|
960
|
-
<text x="120" y="
|
|
961
|
-
<tspan data-lang="fr">(manuel ou /gitflow:9-merge)</tspan>
|
|
962
|
-
<tspan data-lang="en">(manual or /gitflow:9-merge)</tspan>
|
|
963
|
-
</text>
|
|
1126
|
+
<text x="120" y="606" text-anchor="middle" fill="#64748b" font-size="7">(manuel ou /gitflow merge)</text>
|
|
964
1127
|
|
|
965
1128
|
<!-- Arrow to finish -->
|
|
966
|
-
<line x1="120" y1="
|
|
967
|
-
<polygon points="120,
|
|
1129
|
+
<line x1="120" y1="612" x2="120" y2="625" stroke="#22c55e" stroke-width="2.5"/>
|
|
1130
|
+
<polygon points="120,625 114,616 126,616" fill="#22c55e"/>
|
|
968
1131
|
|
|
969
1132
|
<!-- Finish step -->
|
|
970
|
-
<g class="cmd-copyable" data-cmd="/gitflow
|
|
971
|
-
<rect x="30" y="
|
|
972
|
-
<text x="120" y="
|
|
1133
|
+
<g class="cmd-copyable" data-cmd="/gitflow finish" style="cursor:pointer;">
|
|
1134
|
+
<rect x="30" y="630" width="180" height="28" rx="5" fill="#0f172a" stroke="#22c55e" stroke-width="2"/>
|
|
1135
|
+
<text x="120" y="649" text-anchor="middle" fill="#22c55e" font-size="9" font-family="monospace">/gitflow finish</text>
|
|
973
1136
|
</g>
|
|
974
1137
|
|
|
975
1138
|
<!-- Arrow to result -->
|
|
976
|
-
<line x1="120" y1="
|
|
977
|
-
<polygon points="120,
|
|
1139
|
+
<line x1="120" y1="658" x2="120" y2="672" stroke="#22c55e" stroke-width="2.5"/>
|
|
1140
|
+
<polygon points="120,672 114,663 126,663" fill="#22c55e"/>
|
|
978
1141
|
|
|
979
1142
|
<!-- Final cleanup result -->
|
|
980
|
-
<rect x="30" y="
|
|
981
|
-
<text x="120" y="
|
|
1143
|
+
<rect x="30" y="677" width="180" height="45" rx="8" fill="#22c55e" fill-opacity="0.2" stroke="#22c55e" stroke-width="2.5"/>
|
|
1144
|
+
<text x="120" y="695" text-anchor="middle" fill="#22c55e" font-size="10" font-weight="600">
|
|
982
1145
|
<tspan data-lang="fr">Cleanup</tspan>
|
|
983
1146
|
<tspan data-lang="en">Cleanup</tspan>
|
|
984
1147
|
</text>
|
|
985
|
-
<text x="120" y="
|
|
1148
|
+
<text x="120" y="712" text-anchor="middle" fill="#94a3b8" font-size="8">
|
|
986
1149
|
<tspan data-lang="fr">suppression branches + worktree</tspan>
|
|
987
1150
|
<tspan data-lang="en">delete branches + worktree</tspan>
|
|
988
1151
|
</text>
|
|
@@ -1003,9 +1166,9 @@
|
|
|
1003
1166
|
<line x1="400" y1="310" x2="400" y2="335" stroke="#eab308" stroke-width="2.5"/>
|
|
1004
1167
|
<polygon points="400,335 394,321 406,321" fill="#eab308"/>
|
|
1005
1168
|
|
|
1006
|
-
<g class="cmd-copyable" data-cmd="/gitflow
|
|
1169
|
+
<g class="cmd-copyable" data-cmd="/gitflow start release" style="cursor:pointer;">
|
|
1007
1170
|
<rect x="310" y="340" width="180" height="40" rx="6" fill="#0f172a" stroke="#eab308" stroke-width="2"/>
|
|
1008
|
-
<text x="400" y="365" text-anchor="middle" fill="#eab308" font-size="11" font-family="monospace">/gitflow
|
|
1171
|
+
<text x="400" y="365" text-anchor="middle" fill="#eab308" font-size="11" font-family="monospace">/gitflow start release</text>
|
|
1009
1172
|
</g>
|
|
1010
1173
|
|
|
1011
1174
|
<!-- Release: tests... -->
|
|
@@ -1031,9 +1194,9 @@
|
|
|
1031
1194
|
</text>
|
|
1032
1195
|
|
|
1033
1196
|
<!-- Shared commit box between Release and Hotfix -->
|
|
1034
|
-
<g class="cmd-copyable" data-cmd="/gitflow
|
|
1197
|
+
<g class="cmd-copyable" data-cmd="/gitflow commit" style="cursor:pointer;">
|
|
1035
1198
|
<rect x="498" y="465" width="120" height="34" rx="5" fill="#0f172a" stroke="#8b5cf6" stroke-width="2"/>
|
|
1036
|
-
<text x="558" y="487" text-anchor="middle" fill="#8b5cf6" font-size="10" font-family="monospace">/gitflow
|
|
1199
|
+
<text x="558" y="487" text-anchor="middle" fill="#8b5cf6" font-size="10" font-family="monospace">/gitflow commit</text>
|
|
1037
1200
|
</g>
|
|
1038
1201
|
|
|
1039
1202
|
<!-- Hotfix NON -> commit (shared) -->
|
|
@@ -1060,9 +1223,9 @@
|
|
|
1060
1223
|
</text>
|
|
1061
1224
|
|
|
1062
1225
|
<!-- Release: PR step -->
|
|
1063
|
-
<g class="cmd-copyable" data-cmd="/gitflow
|
|
1226
|
+
<g class="cmd-copyable" data-cmd="/gitflow pr" style="cursor:pointer;">
|
|
1064
1227
|
<rect x="310" y="535" width="180" height="28" rx="5" fill="#0f172a" stroke="#06b6d4" stroke-width="2"/>
|
|
1065
|
-
<text x="400" y="554" text-anchor="middle" fill="#06b6d4" font-size="9" font-family="monospace">/gitflow
|
|
1228
|
+
<text x="400" y="554" text-anchor="middle" fill="#06b6d4" font-size="9" font-family="monospace">/gitflow pr</text>
|
|
1066
1229
|
</g>
|
|
1067
1230
|
|
|
1068
1231
|
<line x1="400" y1="563" x2="400" y2="575" stroke="#eab308" stroke-width="2.5"/>
|
|
@@ -1074,14 +1237,14 @@
|
|
|
1074
1237
|
<tspan data-lang="fr">Merge sur GitHub</tspan>
|
|
1075
1238
|
<tspan data-lang="en">Merge on GitHub</tspan>
|
|
1076
1239
|
</text>
|
|
1077
|
-
<text x="400" y="606" text-anchor="middle" fill="#64748b" font-size="7">(manuel ou /gitflow
|
|
1240
|
+
<text x="400" y="606" text-anchor="middle" fill="#64748b" font-size="7">(manuel ou /gitflow merge)</text>
|
|
1078
1241
|
|
|
1079
1242
|
<line x1="400" y1="612" x2="400" y2="625" stroke="#eab308" stroke-width="2.5"/>
|
|
1080
1243
|
<polygon points="400,625 394,616 406,616" fill="#eab308"/>
|
|
1081
1244
|
|
|
1082
|
-
<g class="cmd-copyable" data-cmd="/gitflow
|
|
1245
|
+
<g class="cmd-copyable" data-cmd="/gitflow finish" style="cursor:pointer;">
|
|
1083
1246
|
<rect x="310" y="630" width="180" height="28" rx="5" fill="#0f172a" stroke="#eab308" stroke-width="2"/>
|
|
1084
|
-
<text x="400" y="649" text-anchor="middle" fill="#eab308" font-size="9" font-family="monospace">/gitflow
|
|
1247
|
+
<text x="400" y="649" text-anchor="middle" fill="#eab308" font-size="9" font-family="monospace">/gitflow finish</text>
|
|
1085
1248
|
</g>
|
|
1086
1249
|
|
|
1087
1250
|
<line x1="400" y1="658" x2="400" y2="672" stroke="#eab308" stroke-width="2.5"/>
|
|
@@ -1113,9 +1276,9 @@
|
|
|
1113
1276
|
<line x1="720" y1="310" x2="720" y2="335" stroke="#ec4899" stroke-width="2.5"/>
|
|
1114
1277
|
<polygon points="720,335 714,321 726,321" fill="#ec4899"/>
|
|
1115
1278
|
|
|
1116
|
-
<g class="cmd-copyable" data-cmd="/gitflow
|
|
1279
|
+
<g class="cmd-copyable" data-cmd="/gitflow start hotfix {nom}" style="cursor:pointer;">
|
|
1117
1280
|
<rect x="630" y="340" width="180" height="40" rx="6" fill="#0f172a" stroke="#ec4899" stroke-width="2"/>
|
|
1118
|
-
<text x="720" y="365" text-anchor="middle" fill="#ec4899" font-size="11" font-family="monospace">/gitflow
|
|
1281
|
+
<text x="720" y="365" text-anchor="middle" fill="#ec4899" font-size="11" font-family="monospace">/gitflow start hotfix</text>
|
|
1119
1282
|
</g>
|
|
1120
1283
|
|
|
1121
1284
|
<!-- Hotfix: fix... -->
|
|
@@ -1142,9 +1305,9 @@
|
|
|
1142
1305
|
</text>
|
|
1143
1306
|
|
|
1144
1307
|
<!-- Hotfix: PR step -->
|
|
1145
|
-
<g class="cmd-copyable" data-cmd="/gitflow
|
|
1308
|
+
<g class="cmd-copyable" data-cmd="/gitflow pr" style="cursor:pointer;">
|
|
1146
1309
|
<rect x="630" y="535" width="180" height="28" rx="5" fill="#0f172a" stroke="#06b6d4" stroke-width="2"/>
|
|
1147
|
-
<text x="720" y="554" text-anchor="middle" fill="#06b6d4" font-size="9" font-family="monospace">/gitflow
|
|
1310
|
+
<text x="720" y="554" text-anchor="middle" fill="#06b6d4" font-size="9" font-family="monospace">/gitflow pr</text>
|
|
1148
1311
|
</g>
|
|
1149
1312
|
|
|
1150
1313
|
<line x1="720" y1="563" x2="720" y2="575" stroke="#ec4899" stroke-width="2.5"/>
|
|
@@ -1156,14 +1319,14 @@
|
|
|
1156
1319
|
<tspan data-lang="fr">Merge sur GitHub</tspan>
|
|
1157
1320
|
<tspan data-lang="en">Merge on GitHub</tspan>
|
|
1158
1321
|
</text>
|
|
1159
|
-
<text x="720" y="606" text-anchor="middle" fill="#64748b" font-size="7">(manuel ou /gitflow
|
|
1322
|
+
<text x="720" y="606" text-anchor="middle" fill="#64748b" font-size="7">(manuel ou /gitflow merge)</text>
|
|
1160
1323
|
|
|
1161
1324
|
<line x1="720" y1="612" x2="720" y2="625" stroke="#ec4899" stroke-width="2.5"/>
|
|
1162
1325
|
<polygon points="720,625 714,616 726,616" fill="#ec4899"/>
|
|
1163
1326
|
|
|
1164
|
-
<g class="cmd-copyable" data-cmd="/gitflow
|
|
1327
|
+
<g class="cmd-copyable" data-cmd="/gitflow finish" style="cursor:pointer;">
|
|
1165
1328
|
<rect x="630" y="630" width="180" height="28" rx="5" fill="#0f172a" stroke="#ec4899" stroke-width="2"/>
|
|
1166
|
-
<text x="720" y="649" text-anchor="middle" fill="#ec4899" font-size="9" font-family="monospace">/gitflow
|
|
1329
|
+
<text x="720" y="649" text-anchor="middle" fill="#ec4899" font-size="9" font-family="monospace">/gitflow finish</text>
|
|
1167
1330
|
</g>
|
|
1168
1331
|
|
|
1169
1332
|
<!-- Hotfix result -->
|
|
@@ -1191,27 +1354,27 @@
|
|
|
1191
1354
|
</text>
|
|
1192
1355
|
|
|
1193
1356
|
<!-- Init (first - setup) -->
|
|
1194
|
-
<g class="cmd-copyable" data-cmd="/gitflow
|
|
1357
|
+
<g class="cmd-copyable" data-cmd="/gitflow init" style="cursor:pointer;">
|
|
1195
1358
|
<rect x="955" y="118" width="200" height="36" rx="5" fill="#0f172a" stroke="#475569" stroke-width="2" stroke-dasharray="4,3"/>
|
|
1196
|
-
<text x="1055" y="141" text-anchor="middle" fill="#64748b" font-size="11" font-family="monospace">/gitflow
|
|
1359
|
+
<text x="1055" y="141" text-anchor="middle" fill="#64748b" font-size="11" font-family="monospace">/gitflow init</text>
|
|
1197
1360
|
</g>
|
|
1198
1361
|
|
|
1199
1362
|
<!-- Status -->
|
|
1200
|
-
<g class="cmd-copyable" data-cmd="/gitflow
|
|
1363
|
+
<g class="cmd-copyable" data-cmd="/gitflow status" style="cursor:pointer;">
|
|
1201
1364
|
<rect x="955" y="164" width="200" height="36" rx="5" fill="#0f172a" stroke="#3b82f6" stroke-width="2"/>
|
|
1202
|
-
<text x="1055" y="187" text-anchor="middle" fill="#3b82f6" font-size="11" font-family="monospace">/gitflow
|
|
1365
|
+
<text x="1055" y="187" text-anchor="middle" fill="#3b82f6" font-size="11" font-family="monospace">/gitflow status</text>
|
|
1203
1366
|
</g>
|
|
1204
1367
|
|
|
1205
1368
|
<!-- Commit -->
|
|
1206
|
-
<g class="cmd-copyable" data-cmd="/gitflow
|
|
1369
|
+
<g class="cmd-copyable" data-cmd="/gitflow commit" style="cursor:pointer;">
|
|
1207
1370
|
<rect x="955" y="210" width="200" height="36" rx="5" fill="#0f172a" stroke="#8b5cf6" stroke-width="2"/>
|
|
1208
|
-
<text x="1055" y="233" text-anchor="middle" fill="#8b5cf6" font-size="11" font-family="monospace">/gitflow
|
|
1371
|
+
<text x="1055" y="233" text-anchor="middle" fill="#8b5cf6" font-size="11" font-family="monospace">/gitflow commit</text>
|
|
1209
1372
|
</g>
|
|
1210
1373
|
|
|
1211
1374
|
<!-- Abort -->
|
|
1212
|
-
<g class="cmd-copyable" data-cmd="/gitflow
|
|
1375
|
+
<g class="cmd-copyable" data-cmd="/gitflow abort" style="cursor:pointer;">
|
|
1213
1376
|
<rect x="955" y="256" width="200" height="36" rx="5" fill="#0f172a" stroke="#ef4444" stroke-width="2"/>
|
|
1214
|
-
<text x="1055" y="279" text-anchor="middle" fill="#ef4444" font-size="11" font-family="monospace">/gitflow
|
|
1377
|
+
<text x="1055" y="279" text-anchor="middle" fill="#ef4444" font-size="11" font-family="monospace">/gitflow abort</text>
|
|
1215
1378
|
</g>
|
|
1216
1379
|
|
|
1217
1380
|
<!-- PR Commands Section -->
|
|
@@ -1221,21 +1384,21 @@
|
|
|
1221
1384
|
</text>
|
|
1222
1385
|
|
|
1223
1386
|
<!-- Pull Request -->
|
|
1224
|
-
<g class="cmd-copyable" data-cmd="/gitflow
|
|
1387
|
+
<g class="cmd-copyable" data-cmd="/gitflow pr" style="cursor:pointer;">
|
|
1225
1388
|
<rect x="955" y="332" width="200" height="36" rx="5" fill="#0f172a" stroke="#06b6d4" stroke-width="2"/>
|
|
1226
|
-
<text x="1055" y="355" text-anchor="middle" fill="#06b6d4" font-size="11" font-family="monospace">/gitflow
|
|
1389
|
+
<text x="1055" y="355" text-anchor="middle" fill="#06b6d4" font-size="11" font-family="monospace">/gitflow pr</text>
|
|
1227
1390
|
</g>
|
|
1228
1391
|
|
|
1229
1392
|
<!-- Review -->
|
|
1230
|
-
<g class="cmd-copyable" data-cmd="/gitflow
|
|
1393
|
+
<g class="cmd-copyable" data-cmd="/gitflow merge" style="cursor:pointer;">
|
|
1231
1394
|
<rect x="955" y="378" width="200" height="36" rx="5" fill="#0f172a" stroke="#10b981" stroke-width="2"/>
|
|
1232
|
-
<text x="1055" y="401" text-anchor="middle" fill="#10b981" font-size="11" font-family="monospace">/gitflow
|
|
1395
|
+
<text x="1055" y="401" text-anchor="middle" fill="#10b981" font-size="11" font-family="monospace">/gitflow merge</text>
|
|
1233
1396
|
</g>
|
|
1234
1397
|
|
|
1235
1398
|
<!-- Merge -->
|
|
1236
|
-
<g class="cmd-copyable" data-cmd="/gitflow
|
|
1399
|
+
<g class="cmd-copyable" data-cmd="/gitflow merge" style="cursor:pointer;">
|
|
1237
1400
|
<rect x="955" y="424" width="200" height="36" rx="5" fill="#0f172a" stroke="#6366f1" stroke-width="2"/>
|
|
1238
|
-
<text x="1055" y="447" text-anchor="middle" fill="#6366f1" font-size="11" font-family="monospace">/gitflow
|
|
1401
|
+
<text x="1055" y="447" text-anchor="middle" fill="#6366f1" font-size="11" font-family="monospace">/gitflow merge</text>
|
|
1239
1402
|
</g>
|
|
1240
1403
|
|
|
1241
1404
|
<!-- Cleanup Commands Section -->
|
|
@@ -1245,15 +1408,15 @@
|
|
|
1245
1408
|
</text>
|
|
1246
1409
|
|
|
1247
1410
|
<!-- Finish -->
|
|
1248
|
-
<g class="cmd-copyable" data-cmd="/gitflow
|
|
1411
|
+
<g class="cmd-copyable" data-cmd="/gitflow finish" style="cursor:pointer;">
|
|
1249
1412
|
<rect x="955" y="501" width="200" height="36" rx="5" fill="#0f172a" stroke="#22c55e" stroke-width="2"/>
|
|
1250
|
-
<text x="1055" y="524" text-anchor="middle" fill="#22c55e" font-size="11" font-family="monospace">/gitflow
|
|
1413
|
+
<text x="1055" y="524" text-anchor="middle" fill="#22c55e" font-size="11" font-family="monospace">/gitflow finish</text>
|
|
1251
1414
|
</g>
|
|
1252
1415
|
|
|
1253
1416
|
<!-- Cleanup -->
|
|
1254
|
-
<g class="cmd-copyable" data-cmd="/gitflow
|
|
1417
|
+
<g class="cmd-copyable" data-cmd="/gitflow cleanup" style="cursor:pointer;">
|
|
1255
1418
|
<rect x="955" y="547" width="200" height="36" rx="5" fill="#0f172a" stroke="#f97316" stroke-width="2"/>
|
|
1256
|
-
<text x="1055" y="570" text-anchor="middle" fill="#f97316" font-size="11" font-family="monospace">/gitflow
|
|
1419
|
+
<text x="1055" y="570" text-anchor="middle" fill="#f97316" font-size="11" font-family="monospace">/gitflow cleanup</text>
|
|
1257
1420
|
</g>
|
|
1258
1421
|
|
|
1259
1422
|
<!-- Legend inside box -->
|
|
@@ -1287,223 +1450,223 @@
|
|
|
1287
1450
|
|
|
1288
1451
|
<!-- Command Hierarchy Diagram -->
|
|
1289
1452
|
<div class="svg-diagram" style="margin: 1.5rem 0 2.5rem 0;">
|
|
1290
|
-
<svg viewBox="0 0
|
|
1453
|
+
<svg viewBox="0 0 1200 650" preserveAspectRatio="xMidYMid meet" style="width: 100%; max-width: 1800px; height: auto; display: block; margin: 0 auto;">
|
|
1291
1454
|
<!-- Title -->
|
|
1292
|
-
<text x="
|
|
1455
|
+
<text x="600" y="35" text-anchor="middle" fill="#94a3b8" font-size="18" font-weight="600">
|
|
1293
1456
|
<tspan data-lang="fr">Hierarchie des commandes</tspan>
|
|
1294
1457
|
<tspan data-lang="en">Command Hierarchy</tspan>
|
|
1295
1458
|
</text>
|
|
1296
1459
|
|
|
1297
1460
|
<!-- ===== MAIN WORKFLOW (Center) ===== -->
|
|
1298
|
-
<text x="
|
|
1461
|
+
<text x="600" y="75" text-anchor="middle" fill="#f8fafc" font-size="16" font-weight="600">
|
|
1299
1462
|
<tspan data-lang="fr">WORKFLOW PRINCIPAL</tspan>
|
|
1300
1463
|
<tspan data-lang="en">MAIN WORKFLOW</tspan>
|
|
1301
1464
|
</text>
|
|
1302
1465
|
|
|
1303
1466
|
<!-- Start -->
|
|
1304
|
-
<g transform="translate(
|
|
1305
|
-
<rect x="0" y="0" width="
|
|
1306
|
-
<text x="
|
|
1307
|
-
<text x="
|
|
1467
|
+
<g transform="translate(150, 100)">
|
|
1468
|
+
<rect x="0" y="0" width="200" height="60" rx="10" fill="transparent" stroke="#22c55e" stroke-width="2.5"/>
|
|
1469
|
+
<text x="100" y="28" text-anchor="middle" fill="#4ade80" font-size="14" font-weight="600">/gitflow start</text>
|
|
1470
|
+
<text x="100" y="46" text-anchor="middle" fill="#64748b" font-size="11">
|
|
1308
1471
|
<tspan data-lang="fr">Demarrer branche</tspan>
|
|
1309
1472
|
<tspan data-lang="en">Start branch</tspan>
|
|
1310
1473
|
</text>
|
|
1311
1474
|
</g>
|
|
1312
1475
|
|
|
1313
|
-
<!-- Arrow -->
|
|
1314
|
-
<line x1="
|
|
1315
|
-
<polygon points="
|
|
1476
|
+
<!-- Arrow Start -> Commit -->
|
|
1477
|
+
<line x1="350" y1="130" x2="430" y2="130" stroke="#475569" stroke-width="2.5"/>
|
|
1478
|
+
<polygon points="430,130 418,123 418,137" fill="#475569"/>
|
|
1316
1479
|
|
|
1317
1480
|
<!-- Commit (loop) -->
|
|
1318
|
-
<g transform="translate(
|
|
1319
|
-
<rect x="0" y="0" width="
|
|
1320
|
-
<text x="
|
|
1321
|
-
<text x="
|
|
1481
|
+
<g transform="translate(440, 100)">
|
|
1482
|
+
<rect x="0" y="0" width="200" height="60" rx="10" fill="transparent" stroke="#8b5cf6" stroke-width="2.5"/>
|
|
1483
|
+
<text x="100" y="28" text-anchor="middle" fill="#a78bfa" font-size="14" font-weight="600">/gitflow commit</text>
|
|
1484
|
+
<text x="100" y="46" text-anchor="middle" fill="#64748b" font-size="11">
|
|
1322
1485
|
<tspan data-lang="fr">Commiter (boucle)</tspan>
|
|
1323
1486
|
<tspan data-lang="en">Commit (loop)</tspan>
|
|
1324
1487
|
</text>
|
|
1325
1488
|
<!-- Loop arrow -->
|
|
1326
|
-
<path d="
|
|
1327
|
-
<polygon points="0,
|
|
1489
|
+
<path d="M200,30 Q225,30 225,12 Q225,-8 100,-8 Q-15,-8 -15,12 Q-15,30 0,30" stroke="#8b5cf6" stroke-width="2" fill="none" stroke-dasharray="5,3"/>
|
|
1490
|
+
<polygon points="0,30 10,24 10,36" fill="#8b5cf6"/>
|
|
1328
1491
|
</g>
|
|
1329
1492
|
|
|
1330
|
-
<!--
|
|
1331
|
-
|
|
1332
|
-
<line x1="570" y1="105" x2="610" y2="105" stroke="#475569" stroke-width="2"/>
|
|
1493
|
+
<!-- Arrow Commit -> Decision -->
|
|
1494
|
+
<line x1="640" y1="130" x2="720" y2="130" stroke="#475569" stroke-width="2.5"/>
|
|
1333
1495
|
|
|
1334
|
-
<!-- Decision diamond -->
|
|
1335
|
-
<polygon points="
|
|
1336
|
-
<text x="
|
|
1496
|
+
<!-- Decision diamond (centered) -->
|
|
1497
|
+
<polygon points="780,130 840,85 900,130 840,175" fill="transparent" stroke="#6366f1" stroke-width="2.5"/>
|
|
1498
|
+
<text x="840" y="125" text-anchor="middle" fill="#a5b4fc" font-size="11" font-weight="500">
|
|
1337
1499
|
<tspan data-lang="fr">Methode?</tspan>
|
|
1338
1500
|
<tspan data-lang="en">Method?</tspan>
|
|
1339
1501
|
</text>
|
|
1340
|
-
<text x="
|
|
1502
|
+
<text x="840" y="142" text-anchor="middle" fill="#64748b" font-size="9">PR ou Direct</text>
|
|
1341
1503
|
|
|
1342
|
-
<!-- ===== PATH 1: PR FLOW (
|
|
1343
|
-
|
|
1344
|
-
<
|
|
1504
|
+
<!-- ===== PATH 1: PR FLOW (Right) ===== -->
|
|
1505
|
+
<!-- Arrow right from decision -->
|
|
1506
|
+
<line x1="900" y1="130" x2="980" y2="130" stroke="#06b6d4" stroke-width="2.5"/>
|
|
1507
|
+
<text x="940" y="118" text-anchor="middle" fill="#06b6d4" font-size="10" font-weight="600">PR</text>
|
|
1345
1508
|
|
|
1346
1509
|
<!-- PR Flow label -->
|
|
1347
|
-
<text x="
|
|
1510
|
+
<text x="1090" y="115" text-anchor="middle" fill="#06b6d4" font-size="12" font-weight="600">
|
|
1348
1511
|
<tspan data-lang="fr">METHODE PR</tspan>
|
|
1349
1512
|
<tspan data-lang="en">PR METHOD</tspan>
|
|
1350
1513
|
</text>
|
|
1351
|
-
<text x="
|
|
1352
|
-
<tspan data-lang="fr">Equipe
|
|
1353
|
-
<tspan data-lang="en">Team
|
|
1514
|
+
<text x="1090" y="132" text-anchor="start" fill="#64748b" font-size="9">
|
|
1515
|
+
<tspan data-lang="fr">Equipe / Review</tspan>
|
|
1516
|
+
<tspan data-lang="en">Team / Review</tspan>
|
|
1354
1517
|
</text>
|
|
1355
1518
|
|
|
1356
|
-
<!-- PR
|
|
1357
|
-
<
|
|
1358
|
-
|
|
1359
|
-
|
|
1519
|
+
<!-- Arrow down to PR box -->
|
|
1520
|
+
<path d="M 980 130 L 1040 130 L 1040 200" stroke="#06b6d4" stroke-width="2.5" fill="none"/>
|
|
1521
|
+
<polygon points="1040,200 1034,188 1046,188" fill="#06b6d4"/>
|
|
1522
|
+
|
|
1523
|
+
<!-- PR Flow box (Right side) -->
|
|
1524
|
+
<g transform="translate(640, 210)">
|
|
1525
|
+
<rect x="0" y="0" width="520" height="130" rx="12" fill="#06b6d4" fill-opacity="0.05" stroke="#06b6d4" stroke-width="2"/>
|
|
1526
|
+
<text x="260" y="25" text-anchor="middle" fill="#22d3ee" font-size="13" font-weight="600">
|
|
1360
1527
|
<tspan data-lang="fr">PR FLOW : Equipe / Review / CI</tspan>
|
|
1361
1528
|
<tspan data-lang="en">PR FLOW: Team / Review / CI</tspan>
|
|
1362
1529
|
</text>
|
|
1363
1530
|
|
|
1364
1531
|
<!-- PR -->
|
|
1365
|
-
<g transform="translate(
|
|
1366
|
-
<rect x="0" y="0" width="
|
|
1367
|
-
<text x="
|
|
1368
|
-
<text x="
|
|
1532
|
+
<g transform="translate(25, 45)">
|
|
1533
|
+
<rect x="0" y="0" width="110" height="60" rx="8" fill="transparent" stroke="#06b6d4" stroke-width="2.5"/>
|
|
1534
|
+
<text x="55" y="26" text-anchor="middle" fill="#22d3ee" font-size="11" font-weight="600">/gitflow pr</text>
|
|
1535
|
+
<text x="55" y="44" text-anchor="middle" fill="#64748b" font-size="9">
|
|
1536
|
+
<tspan data-lang="fr">Creer PR</tspan>
|
|
1537
|
+
<tspan data-lang="en">Create PR</tspan>
|
|
1538
|
+
</text>
|
|
1369
1539
|
</g>
|
|
1370
1540
|
|
|
1371
1541
|
<!-- Arrow -->
|
|
1372
|
-
<line x1="
|
|
1373
|
-
<polygon points="
|
|
1542
|
+
<line x1="135" y1="75" x2="160" y2="75" stroke="#06b6d4" stroke-width="2"/>
|
|
1543
|
+
<polygon points="160,75 150,70 150,80" fill="#06b6d4"/>
|
|
1374
1544
|
|
|
1375
1545
|
<!-- Merge GitHub -->
|
|
1376
|
-
<g transform="translate(
|
|
1377
|
-
<rect x="0" y="0" width="
|
|
1378
|
-
<text x="
|
|
1379
|
-
<text x="
|
|
1546
|
+
<g transform="translate(165, 45)">
|
|
1547
|
+
<rect x="0" y="0" width="110" height="60" rx="8" fill="#334155" fill-opacity="0.5" stroke="#64748b" stroke-width="2"/>
|
|
1548
|
+
<text x="55" y="26" text-anchor="middle" fill="#94a3b8" font-size="10" font-weight="500">Merge</text>
|
|
1549
|
+
<text x="55" y="44" text-anchor="middle" fill="#64748b" font-size="9">
|
|
1550
|
+
<tspan data-lang="fr">sur GitHub</tspan>
|
|
1551
|
+
<tspan data-lang="en">on GitHub</tspan>
|
|
1552
|
+
</text>
|
|
1380
1553
|
</g>
|
|
1381
1554
|
|
|
1382
1555
|
<!-- Arrow -->
|
|
1383
|
-
<line x1="
|
|
1384
|
-
<polygon points="
|
|
1556
|
+
<line x1="275" y1="75" x2="300" y2="75" stroke="#06b6d4" stroke-width="2"/>
|
|
1557
|
+
<polygon points="300,75 290,70 290,80" fill="#06b6d4"/>
|
|
1385
1558
|
|
|
1386
1559
|
<!-- Finish -->
|
|
1387
|
-
<g transform="translate(
|
|
1388
|
-
<rect x="0" y="0" width="
|
|
1389
|
-
<text x="
|
|
1390
|
-
<text x="
|
|
1560
|
+
<g transform="translate(305, 45)">
|
|
1561
|
+
<rect x="0" y="0" width="110" height="60" rx="8" fill="transparent" stroke="#22c55e" stroke-width="2.5"/>
|
|
1562
|
+
<text x="55" y="26" text-anchor="middle" fill="#4ade80" font-size="11" font-weight="600">/gitflow finish</text>
|
|
1563
|
+
<text x="55" y="44" text-anchor="middle" fill="#64748b" font-size="9">tag + cleanup</text>
|
|
1391
1564
|
</g>
|
|
1392
1565
|
|
|
1393
1566
|
<!-- Result -->
|
|
1394
|
-
<line x1="
|
|
1395
|
-
<polygon points="
|
|
1396
|
-
<text x="
|
|
1397
|
-
|
|
1398
|
-
<tspan data-lang="en">Done</tspan>
|
|
1399
|
-
</text>
|
|
1400
|
-
<text x="340" y="67" text-anchor="start" fill="#64748b" font-size="6">(branche remote)</text>
|
|
1567
|
+
<line x1="415" y1="75" x2="440" y2="75" stroke="#22c55e" stroke-width="2"/>
|
|
1568
|
+
<polygon points="440,75 430,70 430,80" fill="#22c55e"/>
|
|
1569
|
+
<text x="455" y="72" text-anchor="start" fill="#22c55e" font-size="10" font-weight="500">Done</text>
|
|
1570
|
+
<text x="455" y="86" text-anchor="start" fill="#64748b" font-size="8">(remote)</text>
|
|
1401
1571
|
</g>
|
|
1402
1572
|
|
|
1403
|
-
<!--
|
|
1404
|
-
|
|
1405
|
-
<
|
|
1573
|
+
<!-- ===== PATH 2: DIRECT MERGE (Left) ===== -->
|
|
1574
|
+
<!-- Arrow left from decision -->
|
|
1575
|
+
<line x1="780" y1="130" x2="700" y2="130" stroke="#f97316" stroke-width="2.5"/>
|
|
1576
|
+
<text x="740" y="118" text-anchor="middle" fill="#f97316" font-size="10" font-weight="600">Direct</text>
|
|
1577
|
+
|
|
1578
|
+
<!-- Direct Flow label -->
|
|
1579
|
+
<text x="110" y="115" text-anchor="middle" fill="#f97316" font-size="12" font-weight="600">
|
|
1580
|
+
<tspan data-lang="fr">METHODE DIRECTE</tspan>
|
|
1581
|
+
<tspan data-lang="en">DIRECT METHOD</tspan>
|
|
1582
|
+
</text>
|
|
1583
|
+
<text x="110" y="132" text-anchor="middle" fill="#64748b" font-size="9">
|
|
1584
|
+
<tspan data-lang="fr">Solo / Pas de review</tspan>
|
|
1585
|
+
<tspan data-lang="en">Solo / No review</tspan>
|
|
1586
|
+
</text>
|
|
1406
1587
|
|
|
1407
|
-
<!--
|
|
1408
|
-
<
|
|
1409
|
-
<polygon points="
|
|
1588
|
+
<!-- Arrow down to Direct box -->
|
|
1589
|
+
<path d="M 700 130 L 160 130 L 160 200" stroke="#f97316" stroke-width="2.5" fill="none"/>
|
|
1590
|
+
<polygon points="160,200 154,188 166,188" fill="#f97316"/>
|
|
1410
1591
|
|
|
1411
|
-
<!-- Direct Flow box -->
|
|
1412
|
-
<g transform="translate(40,
|
|
1413
|
-
<rect x="0" y="0" width="
|
|
1414
|
-
<text x="
|
|
1592
|
+
<!-- Direct Flow box (Left side) -->
|
|
1593
|
+
<g transform="translate(40, 210)">
|
|
1594
|
+
<rect x="0" y="0" width="480" height="130" rx="12" fill="#f97316" fill-opacity="0.05" stroke="#f97316" stroke-width="2"/>
|
|
1595
|
+
<text x="240" y="25" text-anchor="middle" fill="#fb923c" font-size="13" font-weight="600">
|
|
1415
1596
|
<tspan data-lang="fr">DIRECT MERGE : Solo / Pas de review</tspan>
|
|
1416
1597
|
<tspan data-lang="en">DIRECT MERGE: Solo / No review</tspan>
|
|
1417
1598
|
</text>
|
|
1418
1599
|
|
|
1419
1600
|
<!-- Plan -->
|
|
1420
|
-
<g transform="translate(60,
|
|
1421
|
-
<rect x="0" y="0" width="
|
|
1422
|
-
<text x="
|
|
1423
|
-
<text x="
|
|
1601
|
+
<g transform="translate(60, 45)">
|
|
1602
|
+
<rect x="0" y="0" width="130" height="60" rx="8" fill="transparent" stroke="#f97316" stroke-width="2.5"/>
|
|
1603
|
+
<text x="65" y="26" text-anchor="middle" fill="#fb923c" font-size="11" font-weight="600">/gitflow plan</text>
|
|
1604
|
+
<text x="65" y="44" text-anchor="middle" fill="#64748b" font-size="9">
|
|
1605
|
+
<tspan data-lang="fr">Analyse conflits</tspan>
|
|
1606
|
+
<tspan data-lang="en">Analyze conflicts</tspan>
|
|
1607
|
+
</text>
|
|
1424
1608
|
</g>
|
|
1425
1609
|
|
|
1426
1610
|
<!-- Arrow -->
|
|
1427
|
-
<line x1="
|
|
1428
|
-
<polygon points="
|
|
1429
|
-
|
|
1430
|
-
<!--
|
|
1431
|
-
<g transform="translate(
|
|
1432
|
-
<rect x="0" y="0" width="
|
|
1433
|
-
<text x="
|
|
1434
|
-
<text x="
|
|
1611
|
+
<line x1="190" y1="75" x2="220" y2="75" stroke="#f97316" stroke-width="2"/>
|
|
1612
|
+
<polygon points="220,75 210,70 210,80" fill="#f97316"/>
|
|
1613
|
+
|
|
1614
|
+
<!-- Merge -->
|
|
1615
|
+
<g transform="translate(225, 45)">
|
|
1616
|
+
<rect x="0" y="0" width="130" height="60" rx="8" fill="transparent" stroke="#f97316" stroke-width="2.5"/>
|
|
1617
|
+
<text x="65" y="26" text-anchor="middle" fill="#fb923c" font-size="11" font-weight="600">/gitflow merge</text>
|
|
1618
|
+
<text x="65" y="44" text-anchor="middle" fill="#64748b" font-size="9">Merge local</text>
|
|
1435
1619
|
</g>
|
|
1436
1620
|
|
|
1437
1621
|
<!-- Result -->
|
|
1438
|
-
<line x1="
|
|
1439
|
-
<polygon points="
|
|
1440
|
-
<text x="
|
|
1441
|
-
|
|
1442
|
-
<tspan data-lang="en">Done</tspan>
|
|
1443
|
-
</text>
|
|
1444
|
-
<text x="315" y="67" text-anchor="start" fill="#64748b" font-size="6">(branche locale)</text>
|
|
1622
|
+
<line x1="355" y1="75" x2="385" y2="75" stroke="#f97316" stroke-width="2"/>
|
|
1623
|
+
<polygon points="385,75 375,70 375,80" fill="#f97316"/>
|
|
1624
|
+
<text x="400" y="72" text-anchor="start" fill="#fb923c" font-size="10" font-weight="500">Done</text>
|
|
1625
|
+
<text x="400" y="86" text-anchor="start" fill="#64748b" font-size="8">(local)</text>
|
|
1445
1626
|
</g>
|
|
1446
1627
|
|
|
1447
|
-
<!-- Connect decision to Direct flow -->
|
|
1448
|
-
<path d="M 690 155 L 690 175 L 420 175 L 420 160" stroke="#f97316" stroke-width="1.5" fill="none"/>
|
|
1449
|
-
<polygon points="420,160 415,170 425,170" fill="#f97316"/>
|
|
1450
|
-
|
|
1451
1628
|
<!-- ===== UTILITIES ===== -->
|
|
1452
|
-
<text x="
|
|
1629
|
+
<text x="600" y="400" text-anchor="middle" fill="#64748b" font-size="14" font-weight="500">
|
|
1453
1630
|
<tspan data-lang="fr">UTILITAIRES (independants)</tspan>
|
|
1454
1631
|
<tspan data-lang="en">UTILITIES (standalone)</tspan>
|
|
1455
1632
|
</text>
|
|
1456
1633
|
|
|
1457
|
-
|
|
1458
|
-
|
|
1459
|
-
<
|
|
1634
|
+
<!-- Utilities in two rows -->
|
|
1635
|
+
<g transform="translate(100, 420)">
|
|
1636
|
+
<rect x="0" y="0" width="150" height="45" rx="8" fill="transparent" stroke="#475569" stroke-width="2" stroke-dasharray="5,3"/>
|
|
1637
|
+
<text x="75" y="28" text-anchor="middle" fill="#64748b" font-size="11">/gitflow init</text>
|
|
1460
1638
|
</g>
|
|
1461
1639
|
|
|
1462
|
-
<g transform="translate(
|
|
1463
|
-
<rect x="0" y="0" width="
|
|
1464
|
-
<text x="
|
|
1640
|
+
<g transform="translate(280, 420)">
|
|
1641
|
+
<rect x="0" y="0" width="160" height="45" rx="8" fill="transparent" stroke="#3b82f6" stroke-width="2"/>
|
|
1642
|
+
<text x="80" y="28" text-anchor="middle" fill="#60a5fa" font-size="11">/gitflow status</text>
|
|
1465
1643
|
</g>
|
|
1466
1644
|
|
|
1467
|
-
<g transform="translate(
|
|
1468
|
-
<rect x="0" y="0" width="
|
|
1469
|
-
<text x="
|
|
1645
|
+
<g transform="translate(470, 420)">
|
|
1646
|
+
<rect x="0" y="0" width="150" height="45" rx="8" fill="transparent" stroke="#ef4444" stroke-width="2"/>
|
|
1647
|
+
<text x="75" y="28" text-anchor="middle" fill="#f87171" font-size="11">/gitflow abort</text>
|
|
1470
1648
|
</g>
|
|
1471
1649
|
|
|
1472
|
-
<g transform="translate(
|
|
1473
|
-
<rect x="0" y="0" width="
|
|
1474
|
-
<text x="
|
|
1650
|
+
<g transform="translate(650, 420)">
|
|
1651
|
+
<rect x="0" y="0" width="160" height="45" rx="8" fill="transparent" stroke="#f97316" stroke-width="2"/>
|
|
1652
|
+
<text x="80" y="28" text-anchor="middle" fill="#fb923c" font-size="11">/gitflow cleanup</text>
|
|
1475
1653
|
</g>
|
|
1476
1654
|
|
|
1477
|
-
<g transform="translate(
|
|
1478
|
-
<rect x="0" y="0" width="
|
|
1479
|
-
<text x="
|
|
1655
|
+
<g transform="translate(840, 420)">
|
|
1656
|
+
<rect x="0" y="0" width="160" height="45" rx="8" fill="transparent" stroke="#22c55e" stroke-width="2"/>
|
|
1657
|
+
<text x="80" y="28" text-anchor="middle" fill="#4ade80" font-size="11">/gitflow finish</text>
|
|
1480
1658
|
</g>
|
|
1481
1659
|
|
|
1482
|
-
<!--
|
|
1483
|
-
<g transform="translate(
|
|
1484
|
-
<rect x="0" y="
|
|
1485
|
-
<text x="
|
|
1486
|
-
|
|
1487
|
-
<tspan data-lang="en">PR Flow (recommended)</tspan>
|
|
1488
|
-
</text>
|
|
1489
|
-
|
|
1490
|
-
<rect x="180" y="-8" width="16" height="16" rx="3" fill="#f97316" fill-opacity="0.1" stroke="#f97316" stroke-width="1.5"/>
|
|
1491
|
-
<text x="205" y="4" fill="#fb923c" font-size="9">
|
|
1492
|
-
<tspan data-lang="fr">Direct Merge (solo)</tspan>
|
|
1493
|
-
<tspan data-lang="en">Direct Merge (solo)</tspan>
|
|
1494
|
-
</text>
|
|
1495
|
-
|
|
1496
|
-
<rect x="360" y="-8" width="16" height="16" rx="3" fill="#334155" fill-opacity="0.5" stroke="#64748b" stroke-width="1"/>
|
|
1497
|
-
<text x="385" y="4" fill="#64748b" font-size="9">
|
|
1498
|
-
<tspan data-lang="fr">Action externe (GitHub)</tspan>
|
|
1499
|
-
<tspan data-lang="en">External action (GitHub)</tspan>
|
|
1500
|
-
</text>
|
|
1660
|
+
<!-- Sync utility -->
|
|
1661
|
+
<g transform="translate(390, 485)">
|
|
1662
|
+
<rect x="0" y="0" width="150" height="45" rx="8" fill="transparent" stroke="#a855f7" stroke-width="2"/>
|
|
1663
|
+
<text x="75" y="28" text-anchor="middle" fill="#c084fc" font-size="11">/gitflow sync</text>
|
|
1664
|
+
</g>
|
|
1501
1665
|
|
|
1502
|
-
|
|
1503
|
-
|
|
1504
|
-
|
|
1505
|
-
|
|
1506
|
-
</text>
|
|
1666
|
+
<!-- Review utility -->
|
|
1667
|
+
<g transform="translate(570, 485)">
|
|
1668
|
+
<rect x="0" y="0" width="160" height="45" rx="8" fill="transparent" stroke="#14b8a6" stroke-width="2"/>
|
|
1669
|
+
<text x="80" y="28" text-anchor="middle" fill="#2dd4bf" font-size="11">/gitflow review</text>
|
|
1507
1670
|
</g>
|
|
1508
1671
|
</svg>
|
|
1509
1672
|
</div>
|
|
@@ -1513,7 +1676,7 @@
|
|
|
1513
1676
|
<!-- gitflow:1-init -->
|
|
1514
1677
|
<div class="command-card" style="background: var(--bg-card); border: 1px solid var(--border); border-radius: 8px; padding: 1.25rem; border-left: 4px solid #475569;">
|
|
1515
1678
|
<div style="display: flex; align-items: center; gap: 0.5rem; margin-bottom: 0.75rem;">
|
|
1516
|
-
<code style="background: #475569; color: #f8fafc; padding: 0.25rem 0.5rem; border-radius: 4px; font-size: 0.85rem;">/gitflow
|
|
1679
|
+
<code style="background: #475569; color: #f8fafc; padding: 0.25rem 0.5rem; border-radius: 4px; font-size: 0.85rem;">/gitflow init</code>
|
|
1517
1680
|
</div>
|
|
1518
1681
|
<h5 style="color: #c8d0dc; margin: 0 0 0.5rem 0; font-size: 0.95rem;">
|
|
1519
1682
|
<span data-lang="fr">Initialisation</span>
|
|
@@ -1528,7 +1691,7 @@
|
|
|
1528
1691
|
<!-- gitflow:2-status -->
|
|
1529
1692
|
<div class="command-card" style="background: var(--bg-card); border: 1px solid var(--border); border-radius: 8px; padding: 1.25rem; border-left: 4px solid #3b82f6;">
|
|
1530
1693
|
<div style="display: flex; align-items: center; gap: 0.5rem; margin-bottom: 0.75rem;">
|
|
1531
|
-
<code style="background: #3b82f6; color: #f8fafc; padding: 0.25rem 0.5rem; border-radius: 4px; font-size: 0.85rem;">/gitflow
|
|
1694
|
+
<code style="background: #3b82f6; color: #f8fafc; padding: 0.25rem 0.5rem; border-radius: 4px; font-size: 0.85rem;">/gitflow status</code>
|
|
1532
1695
|
</div>
|
|
1533
1696
|
<h5 style="color: #c8d0dc; margin: 0 0 0.5rem 0; font-size: 0.95rem;">
|
|
1534
1697
|
<span data-lang="fr">Etat du projet</span>
|
|
@@ -1543,7 +1706,7 @@
|
|
|
1543
1706
|
<!-- gitflow:3-commit -->
|
|
1544
1707
|
<div class="command-card" style="background: var(--bg-card); border: 1px solid var(--border); border-radius: 8px; padding: 1.25rem; border-left: 4px solid #8b5cf6;">
|
|
1545
1708
|
<div style="display: flex; align-items: center; gap: 0.5rem; margin-bottom: 0.75rem;">
|
|
1546
|
-
<code style="background: #8b5cf6; color: #f8fafc; padding: 0.25rem 0.5rem; border-radius: 4px; font-size: 0.85rem;">/gitflow
|
|
1709
|
+
<code style="background: #8b5cf6; color: #f8fafc; padding: 0.25rem 0.5rem; border-radius: 4px; font-size: 0.85rem;">/gitflow commit</code>
|
|
1547
1710
|
</div>
|
|
1548
1711
|
<h5 style="color: #c8d0dc; margin: 0 0 0.5rem 0; font-size: 0.95rem;">
|
|
1549
1712
|
<span data-lang="fr">Commit intelligent</span>
|
|
@@ -1558,22 +1721,22 @@
|
|
|
1558
1721
|
<!-- gitflow:4-plan -->
|
|
1559
1722
|
<div class="command-card" style="background: var(--bg-card); border: 1px solid var(--border); border-radius: 8px; padding: 1.25rem; border-left: 4px solid #f97316;">
|
|
1560
1723
|
<div style="display: flex; align-items: center; gap: 0.5rem; margin-bottom: 0.75rem;">
|
|
1561
|
-
<code style="background: #f97316; color: #f8fafc; padding: 0.25rem 0.5rem; border-radius: 4px; font-size: 0.85rem;">/gitflow
|
|
1724
|
+
<code style="background: #f97316; color: #f8fafc; padding: 0.25rem 0.5rem; border-radius: 4px; font-size: 0.85rem;">/gitflow plan</code>
|
|
1562
1725
|
</div>
|
|
1563
1726
|
<h5 style="color: #c8d0dc; margin: 0 0 0.5rem 0; font-size: 0.95rem;">
|
|
1564
1727
|
<span data-lang="fr">Planifier l'integration</span>
|
|
1565
1728
|
<span data-lang="en">Plan Integration</span>
|
|
1566
1729
|
</h5>
|
|
1567
1730
|
<p style="color: #94a3b8; font-size: 0.85rem; margin: 0; line-height: 1.5;">
|
|
1568
|
-
<span data-lang="fr">Analyse les conflits potentiels avec develop. Cree un plan detaille de merge. A executer avant /gitflow
|
|
1569
|
-
<span data-lang="en">Analyzes potential conflicts with develop. Creates detailed merge plan. Run before /gitflow
|
|
1731
|
+
<span data-lang="fr">Analyse les conflits potentiels avec develop. Cree un plan detaille de merge. A executer avant /gitflow merge.</span>
|
|
1732
|
+
<span data-lang="en">Analyzes potential conflicts with develop. Creates detailed merge plan. Run before /gitflow merge.</span>
|
|
1570
1733
|
</p>
|
|
1571
1734
|
</div>
|
|
1572
1735
|
|
|
1573
1736
|
<!-- gitflow:5-exec -->
|
|
1574
1737
|
<div class="command-card" style="background: var(--bg-card); border: 1px solid var(--border); border-radius: 8px; padding: 1.25rem; border-left: 4px solid #f97316;">
|
|
1575
1738
|
<div style="display: flex; align-items: center; gap: 0.5rem; margin-bottom: 0.75rem;">
|
|
1576
|
-
<code style="background: #f97316; color: #f8fafc; padding: 0.25rem 0.5rem; border-radius: 4px; font-size: 0.85rem;">/gitflow
|
|
1739
|
+
<code style="background: #f97316; color: #f8fafc; padding: 0.25rem 0.5rem; border-radius: 4px; font-size: 0.85rem;">/gitflow merge</code>
|
|
1577
1740
|
</div>
|
|
1578
1741
|
<h5 style="color: #c8d0dc; margin: 0 0 0.5rem 0; font-size: 0.95rem;">
|
|
1579
1742
|
<span data-lang="fr">Executer le merge</span>
|
|
@@ -1588,7 +1751,7 @@
|
|
|
1588
1751
|
<!-- gitflow:6-abort -->
|
|
1589
1752
|
<div class="command-card" style="background: var(--bg-card); border: 1px solid var(--border); border-radius: 8px; padding: 1.25rem; border-left: 4px solid #ef4444;">
|
|
1590
1753
|
<div style="display: flex; align-items: center; gap: 0.5rem; margin-bottom: 0.75rem;">
|
|
1591
|
-
<code style="background: #ef4444; color: #f8fafc; padding: 0.25rem 0.5rem; border-radius: 4px; font-size: 0.85rem;">/gitflow
|
|
1754
|
+
<code style="background: #ef4444; color: #f8fafc; padding: 0.25rem 0.5rem; border-radius: 4px; font-size: 0.85rem;">/gitflow abort</code>
|
|
1592
1755
|
</div>
|
|
1593
1756
|
<h5 style="color: #c8d0dc; margin: 0 0 0.5rem 0; font-size: 0.95rem;">
|
|
1594
1757
|
<span data-lang="fr">Annuler l'operation</span>
|
|
@@ -1603,7 +1766,7 @@
|
|
|
1603
1766
|
<!-- gitflow:7-pull-request -->
|
|
1604
1767
|
<div class="command-card" style="background: var(--bg-card); border: 1px solid var(--border); border-radius: 8px; padding: 1.25rem; border-left: 4px solid #06b6d4;">
|
|
1605
1768
|
<div style="display: flex; align-items: center; gap: 0.5rem; margin-bottom: 0.75rem;">
|
|
1606
|
-
<code style="background: #06b6d4; color: #0f172a; padding: 0.25rem 0.5rem; border-radius: 4px; font-size: 0.85rem;">/gitflow
|
|
1769
|
+
<code style="background: #06b6d4; color: #0f172a; padding: 0.25rem 0.5rem; border-radius: 4px; font-size: 0.85rem;">/gitflow pr</code>
|
|
1607
1770
|
</div>
|
|
1608
1771
|
<h5 style="color: #c8d0dc; margin: 0 0 0.5rem 0; font-size: 0.95rem;">
|
|
1609
1772
|
<span data-lang="fr">Creer une Pull Request</span>
|
|
@@ -1618,7 +1781,7 @@
|
|
|
1618
1781
|
<!-- gitflow:8-review -->
|
|
1619
1782
|
<div class="command-card" style="background: var(--bg-card); border: 1px solid var(--border); border-radius: 8px; padding: 1.25rem; border-left: 4px solid #10b981;">
|
|
1620
1783
|
<div style="display: flex; align-items: center; gap: 0.5rem; margin-bottom: 0.75rem;">
|
|
1621
|
-
<code style="background: #10b981; color: #0f172a; padding: 0.25rem 0.5rem; border-radius: 4px; font-size: 0.85rem;">/gitflow
|
|
1784
|
+
<code style="background: #10b981; color: #0f172a; padding: 0.25rem 0.5rem; border-radius: 4px; font-size: 0.85rem;">/gitflow merge</code>
|
|
1622
1785
|
</div>
|
|
1623
1786
|
<h5 style="color: #c8d0dc; margin: 0 0 0.5rem 0; font-size: 0.95rem;">
|
|
1624
1787
|
<span data-lang="fr">Review de Pull Request</span>
|
|
@@ -1633,7 +1796,7 @@
|
|
|
1633
1796
|
<!-- gitflow:9-merge -->
|
|
1634
1797
|
<div class="command-card" style="background: var(--bg-card); border: 1px solid var(--border); border-radius: 8px; padding: 1.25rem; border-left: 4px solid #6366f1;">
|
|
1635
1798
|
<div style="display: flex; align-items: center; gap: 0.5rem; margin-bottom: 0.75rem;">
|
|
1636
|
-
<code style="background: #6366f1; color: #f8fafc; padding: 0.25rem 0.5rem; border-radius: 4px; font-size: 0.85rem;">/gitflow
|
|
1799
|
+
<code style="background: #6366f1; color: #f8fafc; padding: 0.25rem 0.5rem; border-radius: 4px; font-size: 0.85rem;">/gitflow merge</code>
|
|
1637
1800
|
</div>
|
|
1638
1801
|
<h5 style="color: #c8d0dc; margin: 0 0 0.5rem 0; font-size: 0.95rem;">
|
|
1639
1802
|
<span data-lang="fr">Merger la Pull Request</span>
|
|
@@ -1648,7 +1811,7 @@
|
|
|
1648
1811
|
<!-- gitflow:10-start -->
|
|
1649
1812
|
<div class="command-card" style="background: var(--bg-card); border: 1px solid var(--border); border-radius: 8px; padding: 1.25rem; border-left: 4px solid #22c55e;">
|
|
1650
1813
|
<div style="display: flex; align-items: center; gap: 0.5rem; margin-bottom: 0.75rem;">
|
|
1651
|
-
<code style="background: #22c55e; color: #0f172a; padding: 0.25rem 0.5rem; border-radius: 4px; font-size: 0.85rem;">/gitflow
|
|
1814
|
+
<code style="background: #22c55e; color: #0f172a; padding: 0.25rem 0.5rem; border-radius: 4px; font-size: 0.85rem;">/gitflow start</code>
|
|
1652
1815
|
</div>
|
|
1653
1816
|
<h5 style="color: #c8d0dc; margin: 0 0 0.5rem 0; font-size: 0.95rem;">
|
|
1654
1817
|
<span data-lang="fr">Demarrer une branche</span>
|
|
@@ -1668,7 +1831,7 @@
|
|
|
1668
1831
|
<!-- gitflow:11-finish -->
|
|
1669
1832
|
<div class="command-card" style="background: var(--bg-card); border: 1px solid var(--border); border-radius: 8px; padding: 1.25rem; border-left: 4px solid #eab308;">
|
|
1670
1833
|
<div style="display: flex; align-items: center; gap: 0.5rem; margin-bottom: 0.75rem;">
|
|
1671
|
-
<code style="background: #eab308; color: #0f172a; padding: 0.25rem 0.5rem; border-radius: 4px; font-size: 0.85rem;">/gitflow
|
|
1834
|
+
<code style="background: #eab308; color: #0f172a; padding: 0.25rem 0.5rem; border-radius: 4px; font-size: 0.85rem;">/gitflow finish</code>
|
|
1672
1835
|
</div>
|
|
1673
1836
|
<h5 style="color: #c8d0dc; margin: 0 0 0.5rem 0; font-size: 0.95rem;">
|
|
1674
1837
|
<span data-lang="fr">Finaliser release/hotfix</span>
|
|
@@ -1683,7 +1846,7 @@
|
|
|
1683
1846
|
<!-- gitflow:12-cleanup -->
|
|
1684
1847
|
<div class="command-card" style="background: var(--bg-card); border: 1px solid var(--border); border-radius: 8px; padding: 1.25rem; border-left: 4px solid #64748b;">
|
|
1685
1848
|
<div style="display: flex; align-items: center; gap: 0.5rem; margin-bottom: 0.75rem;">
|
|
1686
|
-
<code style="background: #64748b; color: #f8fafc; padding: 0.25rem 0.5rem; border-radius: 4px; font-size: 0.85rem;">/gitflow
|
|
1849
|
+
<code style="background: #64748b; color: #f8fafc; padding: 0.25rem 0.5rem; border-radius: 4px; font-size: 0.85rem;">/gitflow cleanup</code>
|
|
1687
1850
|
<span style="background: #1e293b; color: #94a3b8; padding: 0.15rem 0.4rem; border-radius: 3px; font-size: 0.7rem;">MAINTENANCE</span>
|
|
1688
1851
|
</div>
|
|
1689
1852
|
<h5 style="color: #c8d0dc; margin: 0 0 0.5rem 0; font-size: 0.95rem;">
|
|
@@ -1696,38 +1859,38 @@
|
|
|
1696
1859
|
</p>
|
|
1697
1860
|
</div>
|
|
1698
1861
|
|
|
1699
|
-
<!-- gitflow
|
|
1862
|
+
<!-- gitflow sync -->
|
|
1700
1863
|
<div class="command-card" style="background: var(--bg-card); border: 1px solid var(--border); border-radius: 8px; padding: 1.25rem; border-left: 4px solid #14b8a6;">
|
|
1701
1864
|
<div style="display: flex; align-items: center; gap: 0.5rem; margin-bottom: 0.75rem;">
|
|
1702
|
-
<code style="background: #14b8a6; color: #0f172a; padding: 0.25rem 0.5rem; border-radius: 4px; font-size: 0.85rem;">/gitflow
|
|
1865
|
+
<code style="background: #14b8a6; color: #0f172a; padding: 0.25rem 0.5rem; border-radius: 4px; font-size: 0.85rem;">/gitflow sync</code>
|
|
1866
|
+
<span class="tag tag-workflow">Sync</span>
|
|
1703
1867
|
</div>
|
|
1704
1868
|
<h5 style="color: #c8d0dc; margin: 0 0 0.5rem 0; font-size: 0.95rem;">
|
|
1705
|
-
<span data-lang="fr">Synchroniser
|
|
1706
|
-
<span data-lang="en">Sync
|
|
1869
|
+
<span data-lang="fr">Synchroniser et Rebase</span>
|
|
1870
|
+
<span data-lang="en">Sync and Rebase</span>
|
|
1707
1871
|
</h5>
|
|
1708
|
-
<p style="color: #94a3b8; font-size: 0.85rem; margin: 0; line-height: 1.5;">
|
|
1709
|
-
<span data-lang="fr">Synchronise la branche locale avec
|
|
1710
|
-
<span data-lang="en">Synchronizes local branch with remote
|
|
1872
|
+
<p style="color: #94a3b8; font-size: 0.85rem; margin: 0 0 0.75rem 0; line-height: 1.5;">
|
|
1873
|
+
<span data-lang="fr">Synchronise la branche locale avec le remote et rebase sur la branche de base si necessaire.</span>
|
|
1874
|
+
<span data-lang="en">Synchronizes local branch with remote and rebases on base branch if needed.</span>
|
|
1711
1875
|
</p>
|
|
1712
|
-
|
|
1713
|
-
|
|
1714
|
-
|
|
1715
|
-
|
|
1716
|
-
<
|
|
1717
|
-
<
|
|
1718
|
-
|
|
1719
|
-
|
|
1720
|
-
<span data-lang="fr">
|
|
1721
|
-
<span data-lang="en">Rebase on
|
|
1722
|
-
|
|
1723
|
-
|
|
1724
|
-
<span data-lang="fr">Rebase la branche courante sur develop (ou branche specifiee) :</span>
|
|
1725
|
-
<span data-lang="en">Rebases current branch on develop (or specified branch):</span>
|
|
1726
|
-
</p>
|
|
1727
|
-
<ul style="color: #94a3b8; font-size: 0.8rem; margin: 0; padding-left: 1.25rem; line-height: 1.6;">
|
|
1728
|
-
<li><code style="color: #a855f7;">/gitflow:14-rebase</code> <span data-lang="fr">→ rebase sur develop</span><span data-lang="en">→ rebase on develop</span></li>
|
|
1729
|
-
<li><code style="color: #a855f7;">/gitflow:14-rebase main</code> <span data-lang="fr">→ rebase sur main</span><span data-lang="en">→ rebase on main</span></li>
|
|
1876
|
+
<h6 style="color: #c8d0dc; margin: 0.75rem 0 0.5rem 0; font-size: 0.85rem;">
|
|
1877
|
+
<span data-lang="fr">Fonctionnalites</span>
|
|
1878
|
+
<span data-lang="en">Features</span>
|
|
1879
|
+
</h6>
|
|
1880
|
+
<ul style="color: #94a3b8; font-size: 0.8rem; margin: 0 0 0.75rem 0; padding-left: 1.25rem; line-height: 1.6;">
|
|
1881
|
+
<li><span data-lang="fr">Fetch depuis le remote</span><span data-lang="en">Fetch from remote</span></li>
|
|
1882
|
+
<li><span data-lang="fr">Calcul de divergence (ahead/behind)</span><span data-lang="en">Divergence calculation (ahead/behind)</span></li>
|
|
1883
|
+
<li><span data-lang="fr">Push des commits locaux</span><span data-lang="en">Push local commits</span></li>
|
|
1884
|
+
<li><span data-lang="fr">Pull avec gestion automatique du stash</span><span data-lang="en">Pull with automatic stash handling</span></li>
|
|
1885
|
+
<li><span data-lang="fr">Rebase sur branche de base si behind</span><span data-lang="en">Rebase on base branch if behind</span></li>
|
|
1886
|
+
<li><span data-lang="fr">Gestion des conflits de migration EF Core</span><span data-lang="en">EF Core migration conflict handling</span></li>
|
|
1887
|
+
<li><span data-lang="fr">Force push avec <code>--force-with-lease</code> apres rebase</span><span data-lang="en">Force push with <code>--force-with-lease</code> after rebase</span></li>
|
|
1730
1888
|
</ul>
|
|
1889
|
+
<div class="code-block" style="margin-top: 0.75rem;">
|
|
1890
|
+
<button class="copy-btn">Copy</button>
|
|
1891
|
+
<pre><code>/gitflow sync # Sync + rebase on base branch
|
|
1892
|
+
/gitflow sync --dry-run # Preview without executing</code></pre>
|
|
1893
|
+
</div>
|
|
1731
1894
|
</div>
|
|
1732
1895
|
</div>
|
|
1733
1896
|
</section>
|
|
@@ -1751,7 +1914,7 @@
|
|
|
1751
1914
|
|
|
1752
1915
|
<!-- Worktree Structure SVG Diagram -->
|
|
1753
1916
|
<div class="svg-diagram" style="margin: 1.5rem 0;">
|
|
1754
|
-
<svg viewBox="0 0 1100 520" preserveAspectRatio="xMidYMid meet" style="width: 100%; max-width:
|
|
1917
|
+
<svg viewBox="0 0 1100 520" preserveAspectRatio="xMidYMid meet" style="width: 100%; max-width: 1800px; height: auto; display: block; margin: 0 auto;">
|
|
1755
1918
|
<!-- Definitions for folder icons -->
|
|
1756
1919
|
<defs>
|
|
1757
1920
|
<linearGradient id="folderGradient" x1="0%" y1="0%" x2="0%" y2="100%">
|
|
@@ -2021,8 +2184,8 @@
|
|
|
2021
2184
|
<tr>
|
|
2022
2185
|
<td><a href=".claude/gitflow/plans/" class="file-link"><code>.claude/gitflow/plans/</code></a></td>
|
|
2023
2186
|
<td>
|
|
2024
|
-
<span data-lang="fr">Plans d'integration generes par /gitflow
|
|
2025
|
-
<span data-lang="en">Integration plans generated by /gitflow
|
|
2187
|
+
<span data-lang="fr">Plans d'integration generes par /gitflow plan</span>
|
|
2188
|
+
<span data-lang="en">Integration plans generated by /gitflow plan</span>
|
|
2026
2189
|
</td>
|
|
2027
2190
|
</tr>
|
|
2028
2191
|
<tr>
|
|
@@ -2047,23 +2210,23 @@
|
|
|
2047
2210
|
<h3 data-lang="en">Automatic Creation</h3>
|
|
2048
2211
|
|
|
2049
2212
|
<p data-lang="fr">
|
|
2050
|
-
La structure est creee automatiquement par <code>/gitflow
|
|
2213
|
+
La structure est creee automatiquement par <code>/gitflow init</code>. Les worktrees sont crees lors du premier <code>/gitflow start</code>.
|
|
2051
2214
|
</p>
|
|
2052
2215
|
<p data-lang="en">
|
|
2053
|
-
The structure is automatically created by <code>/gitflow
|
|
2216
|
+
The structure is automatically created by <code>/gitflow init</code>. Worktrees are created on the first <code>/gitflow start</code>.
|
|
2054
2217
|
</p>
|
|
2055
2218
|
|
|
2056
2219
|
<div class="code-block">
|
|
2057
2220
|
<button class="copy-btn">Copy</button>
|
|
2058
2221
|
<pre><code><span class="code-comment"># Initialiser GitFlow avec worktrees</span>
|
|
2059
|
-
<span class="code-cmd">/gitflow
|
|
2222
|
+
<span class="code-cmd">/gitflow init</span> <span class="code-flag">--with-worktrees</span>
|
|
2060
2223
|
|
|
2061
2224
|
<span class="code-comment"># Demarrer une feature (cree le worktree automatiquement)</span>
|
|
2062
|
-
<span class="code-cmd">/gitflow
|
|
2225
|
+
<span class="code-cmd">/gitflow start</span> <span class="code-arg">feature</span> <span class="code-string">user-auth</span>
|
|
2063
2226
|
<span class="code-output"># → Worktree cree: ../worktrees/features/user-auth/</span>
|
|
2064
2227
|
|
|
2065
2228
|
<span class="code-comment"># Travailler sans worktree (meme repertoire)</span>
|
|
2066
|
-
<span class="code-cmd">/gitflow
|
|
2229
|
+
<span class="code-cmd">/gitflow start</span> <span class="code-arg">feature</span> <span class="code-string">test</span> <span class="code-flag">--no-worktree</span></code></pre>
|
|
2067
2230
|
</div>
|
|
2068
2231
|
</section>
|
|
2069
2232
|
|
|
@@ -2104,10 +2267,10 @@ release/new</code></pre>
|
|
|
2104
2267
|
<span data-lang="en">Atomic Commits</span>
|
|
2105
2268
|
</h4>
|
|
2106
2269
|
<p data-lang="fr">
|
|
2107
|
-
Chaque commit doit representer un changement logique unique. Utilisez <code>/gitflow
|
|
2270
|
+
Chaque commit doit representer un changement logique unique. Utilisez <code>/gitflow commit</code> pour des commits structures.
|
|
2108
2271
|
</p>
|
|
2109
2272
|
<p data-lang="en">
|
|
2110
|
-
Each commit should represent a single logical change. Use <code>/gitflow
|
|
2273
|
+
Each commit should represent a single logical change. Use <code>/gitflow commit</code> for structured commits.
|
|
2111
2274
|
</p>
|
|
2112
2275
|
<div class="code-block">
|
|
2113
2276
|
<pre><code># Bon - Commits atomiques
|
|
@@ -2133,7 +2296,7 @@ WIP: auth stuff</code></pre>
|
|
|
2133
2296
|
Before merging a feature, rebase on develop to have a clean history and avoid merge conflicts.
|
|
2134
2297
|
</p>
|
|
2135
2298
|
<div class="code-block">
|
|
2136
|
-
<pre><code># Claude Tools le fait automatiquement avec /gitflow
|
|
2299
|
+
<pre><code># Claude Tools le fait automatiquement avec /gitflow merge
|
|
2137
2300
|
# Manuellement :
|
|
2138
2301
|
git checkout feature/my-feature
|
|
2139
2302
|
git fetch origin
|
|
@@ -2165,20 +2328,20 @@ git merge --no-ff feature/my-feature</code></pre>
|
|
|
2165
2328
|
<span data-lang="en">Regularly Clean Up Worktrees</span>
|
|
2166
2329
|
</h4>
|
|
2167
2330
|
<p data-lang="fr">
|
|
2168
|
-
Apres chaque release ou hotfix, les worktrees sont nettoyes automatiquement. Pour un audit complet, utilisez <code>/gitflow
|
|
2331
|
+
Apres chaque release ou hotfix, les worktrees sont nettoyes automatiquement. Pour un audit complet, utilisez <code>/gitflow cleanup</code> depuis main ou develop.
|
|
2169
2332
|
</p>
|
|
2170
2333
|
<p data-lang="en">
|
|
2171
|
-
After each release or hotfix, worktrees are automatically cleaned up. For a full audit, use <code>/gitflow
|
|
2334
|
+
After each release or hotfix, worktrees are automatically cleaned up. For a full audit, use <code>/gitflow cleanup</code> from main or develop.
|
|
2172
2335
|
</p>
|
|
2173
2336
|
<div class="code-block">
|
|
2174
2337
|
<pre><code># Audit et nettoyage complet (depuis main ou develop)
|
|
2175
|
-
/gitflow
|
|
2338
|
+
/gitflow cleanup
|
|
2176
2339
|
|
|
2177
2340
|
# Audit seul sans suppression
|
|
2178
|
-
/gitflow
|
|
2341
|
+
/gitflow cleanup --dry-run
|
|
2179
2342
|
|
|
2180
2343
|
# Nettoyage automatique des orphelins
|
|
2181
|
-
/gitflow
|
|
2344
|
+
/gitflow cleanup --force</code></pre>
|
|
2182
2345
|
</div>
|
|
2183
2346
|
</div>
|
|
2184
2347
|
|
|
@@ -2189,10 +2352,10 @@ git merge --no-ff feature/my-feature</code></pre>
|
|
|
2189
2352
|
<span data-lang="en">Test Before Merging</span>
|
|
2190
2353
|
</h4>
|
|
2191
2354
|
<p data-lang="fr">
|
|
2192
|
-
<code>/gitflow
|
|
2355
|
+
<code>/gitflow merge</code> execute automatiquement les tests, le build et le lint avant tout merge.
|
|
2193
2356
|
</p>
|
|
2194
2357
|
<p data-lang="en">
|
|
2195
|
-
<code>/gitflow
|
|
2358
|
+
<code>/gitflow merge</code> automatically runs tests, build and lint before any merge.
|
|
2196
2359
|
</p>
|
|
2197
2360
|
</div>
|
|
2198
2361
|
|
|
@@ -2237,10 +2400,10 @@ git merge --no-ff feature/my-feature</code></pre>
|
|
|
2237
2400
|
<p data-lang="fr">Claude Tools fournit 12 commandes pour gerer le workflow GitFlow. Chaque commande inclut son prompt complet.</p>
|
|
2238
2401
|
<p data-lang="en">Claude Tools provides 12 commands to manage the GitFlow workflow. Each command includes its complete prompt.</p>
|
|
2239
2402
|
|
|
2240
|
-
<!-- Command: /gitflow
|
|
2403
|
+
<!-- Command: /gitflow init -->
|
|
2241
2404
|
<div class="command-card">
|
|
2242
2405
|
<div class="command-header">
|
|
2243
|
-
<code class="command-name">/gitflow
|
|
2406
|
+
<code class="command-name">/gitflow init</code>
|
|
2244
2407
|
<span class="tag tag-command">Setup</span>
|
|
2245
2408
|
</div>
|
|
2246
2409
|
<div class="command-body">
|
|
@@ -2252,15 +2415,15 @@ git merge --no-ff feature/my-feature</code></pre>
|
|
|
2252
2415
|
</p>
|
|
2253
2416
|
<div class="code-block">
|
|
2254
2417
|
<button class="copy-btn">Copy</button>
|
|
2255
|
-
<pre><code>/gitflow
|
|
2418
|
+
<pre><code>/gitflow init</code></pre>
|
|
2256
2419
|
</div>
|
|
2257
2420
|
</div>
|
|
2258
2421
|
</div>
|
|
2259
2422
|
|
|
2260
|
-
<!-- Command: /gitflow
|
|
2423
|
+
<!-- Command: /gitflow status -->
|
|
2261
2424
|
<div class="command-card">
|
|
2262
2425
|
<div class="command-header">
|
|
2263
|
-
<code class="command-name">/gitflow
|
|
2426
|
+
<code class="command-name">/gitflow status</code>
|
|
2264
2427
|
<span class="tag tag-command">Info</span>
|
|
2265
2428
|
</div>
|
|
2266
2429
|
<div class="command-body">
|
|
@@ -2272,18 +2435,18 @@ git merge --no-ff feature/my-feature</code></pre>
|
|
|
2272
2435
|
</p>
|
|
2273
2436
|
<div class="code-block">
|
|
2274
2437
|
<button class="copy-btn">Copy</button>
|
|
2275
|
-
<pre><code>/gitflow
|
|
2438
|
+
<pre><code>/gitflow status
|
|
2276
2439
|
|
|
2277
2440
|
# Voir toutes les branches avec migrations
|
|
2278
|
-
/gitflow
|
|
2441
|
+
/gitflow status --all-branches</code></pre>
|
|
2279
2442
|
</div>
|
|
2280
2443
|
</div>
|
|
2281
2444
|
</div>
|
|
2282
2445
|
|
|
2283
|
-
<!-- Command: /gitflow
|
|
2446
|
+
<!-- Command: /gitflow commit -->
|
|
2284
2447
|
<div class="command-card">
|
|
2285
2448
|
<div class="command-header">
|
|
2286
|
-
<code class="command-name">/gitflow
|
|
2449
|
+
<code class="command-name">/gitflow commit</code>
|
|
2287
2450
|
<span class="tag tag-command">Git</span>
|
|
2288
2451
|
</div>
|
|
2289
2452
|
<div class="command-body">
|
|
@@ -2295,7 +2458,7 @@ git merge --no-ff feature/my-feature</code></pre>
|
|
|
2295
2458
|
</p>
|
|
2296
2459
|
<div class="code-block">
|
|
2297
2460
|
<button class="copy-btn">Copy</button>
|
|
2298
|
-
<pre><code>/gitflow
|
|
2461
|
+
<pre><code>/gitflow commit</code></pre>
|
|
2299
2462
|
</div>
|
|
2300
2463
|
|
|
2301
2464
|
<div class="alert alert-info">
|
|
@@ -2314,70 +2477,70 @@ git merge --no-ff feature/my-feature</code></pre>
|
|
|
2314
2477
|
</div>
|
|
2315
2478
|
</div>
|
|
2316
2479
|
|
|
2317
|
-
<!-- Command: /gitflow
|
|
2480
|
+
<!-- Command: /gitflow plan -->
|
|
2318
2481
|
<div class="command-card">
|
|
2319
2482
|
<div class="command-header">
|
|
2320
|
-
<code class="command-name">/gitflow
|
|
2483
|
+
<code class="command-name">/gitflow plan</code>
|
|
2321
2484
|
<span class="tag tag-workflow">Planning</span>
|
|
2322
2485
|
</div>
|
|
2323
2486
|
<div class="command-body">
|
|
2324
2487
|
<p data-lang="fr">
|
|
2325
|
-
Cette commande prepare une integration complexe en analysant tous les aspects critiques avant l'execution. Elle examine la branche courante pour determiner le nombre de commits a integrer, detecte les migrations EF Core presentes et verifie s'il y a un conflit ModelSnapshot avec la branche cible. En fonction du type de branche (feature, release, hotfix), elle determine la strategie optimale : rebase simple, rebase avec recreation de migration si conflit, ou merge direct. Le resultat est un fichier plan detaille dans .claude/gitflow/plans/ qui liste toutes les etapes a executer, les risques identifies, et les actions de rollback possibles. Ce plan peut etre relu et valide avant execution avec /gitflow
|
|
2488
|
+
Cette commande prepare une integration complexe en analysant tous les aspects critiques avant l'execution. Elle examine la branche courante pour determiner le nombre de commits a integrer, detecte les migrations EF Core presentes et verifie s'il y a un conflit ModelSnapshot avec la branche cible. En fonction du type de branche (feature, release, hotfix), elle determine la strategie optimale : rebase simple, rebase avec recreation de migration si conflit, ou merge direct. Le resultat est un fichier plan detaille dans .claude/gitflow/plans/ qui liste toutes les etapes a executer, les risques identifies, et les actions de rollback possibles. Ce plan peut etre relu et valide avant execution avec /gitflow merge.
|
|
2326
2489
|
</p>
|
|
2327
2490
|
<p data-lang="en">
|
|
2328
|
-
This command prepares a complex integration by analyzing all critical aspects before execution. It examines the current branch to determine the number of commits to integrate, detects present EF Core migrations and checks for ModelSnapshot conflicts with the target branch. Based on branch type (feature, release, hotfix), it determines the optimal strategy: simple rebase, rebase with migration recreation if conflict, or direct merge. The result is a detailed plan file in .claude/gitflow/plans/ listing all steps to execute, identified risks, and possible rollback actions. This plan can be reviewed and validated before execution with /gitflow
|
|
2491
|
+
This command prepares a complex integration by analyzing all critical aspects before execution. It examines the current branch to determine the number of commits to integrate, detects present EF Core migrations and checks for ModelSnapshot conflicts with the target branch. Based on branch type (feature, release, hotfix), it determines the optimal strategy: simple rebase, rebase with migration recreation if conflict, or direct merge. The result is a detailed plan file in .claude/gitflow/plans/ listing all steps to execute, identified risks, and possible rollback actions. This plan can be reviewed and validated before execution with /gitflow merge.
|
|
2329
2492
|
</p>
|
|
2330
2493
|
<div class="code-block">
|
|
2331
2494
|
<button class="copy-btn">Copy</button>
|
|
2332
|
-
<pre><code>/gitflow
|
|
2495
|
+
<pre><code>/gitflow plan</code></pre>
|
|
2333
2496
|
</div>
|
|
2334
2497
|
</div>
|
|
2335
2498
|
</div>
|
|
2336
2499
|
|
|
2337
|
-
<!-- Command: /gitflow
|
|
2500
|
+
<!-- Command: /gitflow merge -->
|
|
2338
2501
|
<div class="command-card">
|
|
2339
2502
|
<div class="command-header">
|
|
2340
|
-
<code class="command-name">/gitflow
|
|
2503
|
+
<code class="command-name">/gitflow merge</code>
|
|
2341
2504
|
<span class="tag tag-workflow">Execution</span>
|
|
2342
2505
|
</div>
|
|
2343
2506
|
<div class="command-body">
|
|
2344
2507
|
<p data-lang="fr">
|
|
2345
|
-
Cette commande execute le plan genere par /gitflow
|
|
2508
|
+
Cette commande execute le plan genere par /gitflow plan de maniere securisee et tracable. Elle commence par creer un checkpoint permettant un rollback en cas de probleme, puis execute chaque etape du plan : fetch des dernieres modifications, rebase sur la branche cible si necessaire (avec gestion automatique des conflits ModelSnapshot), merge avec l'option --no-ff pour preserver l'historique, et mise a jour du versioning. Pour les releases et hotfixes, elle gere automatiquement le tag Git et l'increment de version. A chaque etape, elle valide le build et les tests. En cas d'echec, elle peut etre reprise avec --resume ou annulee avec /gitflow abort. L'option --dry-run permet de simuler l'execution sans rien modifier.
|
|
2346
2509
|
</p>
|
|
2347
2510
|
<p data-lang="en">
|
|
2348
|
-
This command executes the plan generated by /gitflow
|
|
2511
|
+
This command executes the plan generated by /gitflow plan in a secure and traceable manner. It starts by creating a checkpoint allowing rollback in case of issues, then executes each plan step: fetching latest changes, rebasing on target branch if needed (with automatic ModelSnapshot conflict handling), merging with --no-ff option to preserve history, and version update. For releases and hotfixes, it automatically handles Git tag and version increment. At each step, it validates build and tests. On failure, it can be resumed with --resume or cancelled with /gitflow abort. The --dry-run option allows simulating execution without modifying anything.
|
|
2349
2512
|
</p>
|
|
2350
2513
|
<div class="code-block">
|
|
2351
2514
|
<button class="copy-btn">Copy</button>
|
|
2352
|
-
<pre><code>/gitflow
|
|
2515
|
+
<pre><code>/gitflow merge</code></pre>
|
|
2353
2516
|
</div>
|
|
2354
2517
|
</div>
|
|
2355
2518
|
</div>
|
|
2356
2519
|
|
|
2357
|
-
<!-- Command: /gitflow
|
|
2520
|
+
<!-- Command: /gitflow abort -->
|
|
2358
2521
|
<div class="command-card">
|
|
2359
2522
|
<div class="command-header">
|
|
2360
|
-
<code class="command-name">/gitflow
|
|
2523
|
+
<code class="command-name">/gitflow abort</code>
|
|
2361
2524
|
<span class="tag tag-danger">Rollback</span>
|
|
2362
2525
|
</div>
|
|
2363
2526
|
<div class="command-body">
|
|
2364
2527
|
<p data-lang="fr">
|
|
2365
|
-
Cette commande est votre filet de securite quand une operation GitFlow tourne mal. Elle detecte automatiquement l'etat actuel du repository (merge en cours, rebase interrompu, conflit non resolu) et propose les options de recuperation appropriees. Elle peut annuler un merge avec git merge --abort, restaurer l'etat complet depuis un checkpoint sauvegarde par /gitflow
|
|
2528
|
+
Cette commande est votre filet de securite quand une operation GitFlow tourne mal. Elle detecte automatiquement l'etat actuel du repository (merge en cours, rebase interrompu, conflit non resolu) et propose les options de recuperation appropriees. Elle peut annuler un merge avec git merge --abort, restaurer l'etat complet depuis un checkpoint sauvegarde par /gitflow merge, abandonner completement une branche feature/hotfix en la supprimant proprement, ou nettoyer le working directory. Avant toute operation destructive, elle affiche clairement ce qui sera perdu et demande une confirmation explicite. C'est la commande a utiliser en cas de probleme pour revenir a un etat stable sans perdre de travail.
|
|
2366
2529
|
</p>
|
|
2367
2530
|
<p data-lang="en">
|
|
2368
|
-
This command is your safety net when a GitFlow operation goes wrong. It automatically detects the current repository state (ongoing merge, interrupted rebase, unresolved conflict) and offers appropriate recovery options. It can cancel a merge with git merge --abort, restore complete state from a checkpoint saved by /gitflow
|
|
2531
|
+
This command is your safety net when a GitFlow operation goes wrong. It automatically detects the current repository state (ongoing merge, interrupted rebase, unresolved conflict) and offers appropriate recovery options. It can cancel a merge with git merge --abort, restore complete state from a checkpoint saved by /gitflow merge, completely abandon a feature/hotfix branch by cleanly deleting it, or clean the working directory. Before any destructive operation, it clearly shows what will be lost and asks for explicit confirmation. This is the command to use when problems occur to return to a stable state without losing work.
|
|
2369
2532
|
</p>
|
|
2370
2533
|
<div class="code-block">
|
|
2371
2534
|
<button class="copy-btn">Copy</button>
|
|
2372
|
-
<pre><code>/gitflow
|
|
2535
|
+
<pre><code>/gitflow abort</code></pre>
|
|
2373
2536
|
</div>
|
|
2374
2537
|
</div>
|
|
2375
2538
|
</div>
|
|
2376
2539
|
|
|
2377
|
-
<!-- Command: /gitflow
|
|
2540
|
+
<!-- Command: /gitflow pr -->
|
|
2378
2541
|
<div class="command-card">
|
|
2379
2542
|
<div class="command-header">
|
|
2380
|
-
<code class="command-name">/gitflow
|
|
2543
|
+
<code class="command-name">/gitflow pr</code>
|
|
2381
2544
|
<span class="tag tag-info">PR</span>
|
|
2382
2545
|
</div>
|
|
2383
2546
|
<div class="command-body">
|
|
@@ -2390,21 +2553,21 @@ git merge --no-ff feature/my-feature</code></pre>
|
|
|
2390
2553
|
<div class="code-block">
|
|
2391
2554
|
<button class="copy-btn">Copy</button>
|
|
2392
2555
|
<pre><code># PR vers develop (default)
|
|
2393
|
-
/gitflow
|
|
2556
|
+
/gitflow pr
|
|
2394
2557
|
|
|
2395
2558
|
# PR vers main (release/hotfix)
|
|
2396
|
-
/gitflow
|
|
2559
|
+
/gitflow pr main
|
|
2397
2560
|
|
|
2398
2561
|
# PR en draft
|
|
2399
|
-
/gitflow
|
|
2562
|
+
/gitflow pr --draft</code></pre>
|
|
2400
2563
|
</div>
|
|
2401
2564
|
</div>
|
|
2402
2565
|
</div>
|
|
2403
2566
|
|
|
2404
|
-
<!-- Command: /gitflow
|
|
2567
|
+
<!-- Command: /gitflow merge -->
|
|
2405
2568
|
<div class="command-card">
|
|
2406
2569
|
<div class="command-header">
|
|
2407
|
-
<code class="command-name">/gitflow
|
|
2570
|
+
<code class="command-name">/gitflow merge</code>
|
|
2408
2571
|
<span class="tag tag-success">Review</span>
|
|
2409
2572
|
</div>
|
|
2410
2573
|
<div class="command-body">
|
|
@@ -2417,21 +2580,21 @@ git merge --no-ff feature/my-feature</code></pre>
|
|
|
2417
2580
|
<div class="code-block">
|
|
2418
2581
|
<button class="copy-btn">Copy</button>
|
|
2419
2582
|
<pre><code># Review PR #123
|
|
2420
|
-
/gitflow
|
|
2583
|
+
/gitflow merge 123
|
|
2421
2584
|
|
|
2422
2585
|
# Focus securite
|
|
2423
|
-
/gitflow
|
|
2586
|
+
/gitflow merge 123 --security
|
|
2424
2587
|
|
|
2425
2588
|
# Focus migrations EF Core
|
|
2426
|
-
/gitflow
|
|
2589
|
+
/gitflow merge 123 --ef-core</code></pre>
|
|
2427
2590
|
</div>
|
|
2428
2591
|
</div>
|
|
2429
2592
|
</div>
|
|
2430
2593
|
|
|
2431
|
-
<!-- Command: /gitflow
|
|
2594
|
+
<!-- Command: /gitflow merge -->
|
|
2432
2595
|
<div class="command-card">
|
|
2433
2596
|
<div class="command-header">
|
|
2434
|
-
<code class="command-name">/gitflow
|
|
2597
|
+
<code class="command-name">/gitflow merge</code>
|
|
2435
2598
|
<span class="tag tag-primary">Merge</span>
|
|
2436
2599
|
</div>
|
|
2437
2600
|
<div class="command-body">
|
|
@@ -2444,21 +2607,21 @@ git merge --no-ff feature/my-feature</code></pre>
|
|
|
2444
2607
|
<div class="code-block">
|
|
2445
2608
|
<button class="copy-btn">Copy</button>
|
|
2446
2609
|
<pre><code># Merge PR #123
|
|
2447
|
-
/gitflow
|
|
2610
|
+
/gitflow merge 123
|
|
2448
2611
|
|
|
2449
2612
|
# Auto-merge quand CI vert
|
|
2450
|
-
/gitflow
|
|
2613
|
+
/gitflow merge 123 --auto
|
|
2451
2614
|
|
|
2452
2615
|
# Simulation
|
|
2453
|
-
/gitflow
|
|
2616
|
+
/gitflow merge 123 --dry-run</code></pre>
|
|
2454
2617
|
</div>
|
|
2455
2618
|
</div>
|
|
2456
2619
|
</div>
|
|
2457
2620
|
|
|
2458
|
-
<!-- Command: /gitflow
|
|
2621
|
+
<!-- Command: /gitflow start -->
|
|
2459
2622
|
<div class="command-card">
|
|
2460
2623
|
<div class="command-header">
|
|
2461
|
-
<code class="command-name">/gitflow
|
|
2624
|
+
<code class="command-name">/gitflow start</code>
|
|
2462
2625
|
<span class="tag tag-workflow">Branch</span>
|
|
2463
2626
|
</div>
|
|
2464
2627
|
<div class="command-body">
|
|
@@ -2471,16 +2634,16 @@ git merge --no-ff feature/my-feature</code></pre>
|
|
|
2471
2634
|
<div class="code-block">
|
|
2472
2635
|
<button class="copy-btn">Copy</button>
|
|
2473
2636
|
<pre><code># Demarrer une feature
|
|
2474
|
-
/gitflow
|
|
2637
|
+
/gitflow start feature authentication
|
|
2475
2638
|
|
|
2476
2639
|
# Demarrer une release (avec options avancees EF Core)
|
|
2477
|
-
/gitflow
|
|
2640
|
+
/gitflow start release
|
|
2478
2641
|
|
|
2479
2642
|
# Demarrer un hotfix
|
|
2480
|
-
/gitflow
|
|
2643
|
+
/gitflow start hotfix critical-bug
|
|
2481
2644
|
|
|
2482
2645
|
# Sans worktree (meme repertoire)
|
|
2483
|
-
/gitflow
|
|
2646
|
+
/gitflow start feature test --no-worktree</code></pre>
|
|
2484
2647
|
</div>
|
|
2485
2648
|
|
|
2486
2649
|
<div class="alert alert-info" style="margin-top: 1rem;">
|
|
@@ -2503,10 +2666,10 @@ git merge --no-ff feature/my-feature</code></pre>
|
|
|
2503
2666
|
</div>
|
|
2504
2667
|
</div>
|
|
2505
2668
|
|
|
2506
|
-
<!-- Command: /gitflow
|
|
2669
|
+
<!-- Command: /gitflow finish -->
|
|
2507
2670
|
<div class="command-card">
|
|
2508
2671
|
<div class="command-header">
|
|
2509
|
-
<code class="command-name">/gitflow
|
|
2672
|
+
<code class="command-name">/gitflow finish</code>
|
|
2510
2673
|
<span class="tag tag-workflow">Branch</span>
|
|
2511
2674
|
</div>
|
|
2512
2675
|
<div class="command-body">
|
|
@@ -2518,27 +2681,27 @@ git merge --no-ff feature/my-feature</code></pre>
|
|
|
2518
2681
|
</p>
|
|
2519
2682
|
<div class="code-block">
|
|
2520
2683
|
<button class="copy-btn">Copy</button>
|
|
2521
|
-
<pre><code>/gitflow
|
|
2684
|
+
<pre><code>/gitflow finish</code></pre>
|
|
2522
2685
|
</div>
|
|
2523
2686
|
</div>
|
|
2524
2687
|
</div>
|
|
2525
2688
|
|
|
2526
|
-
<!-- Command: /gitflow
|
|
2689
|
+
<!-- Command: /gitflow cleanup -->
|
|
2527
2690
|
<div class="command-card">
|
|
2528
2691
|
<div class="command-header">
|
|
2529
|
-
<code class="command-name">/gitflow
|
|
2692
|
+
<code class="command-name">/gitflow cleanup</code>
|
|
2530
2693
|
<span class="tag tag-workflow">Maintenance</span>
|
|
2531
2694
|
</div>
|
|
2532
2695
|
<div class="command-body">
|
|
2533
2696
|
<p data-lang="fr">
|
|
2534
|
-
Cette commande de maintenance audite et nettoie les worktrees accumules au fil du temps. Elle categorise chaque worktree trouve : permanents (main, develop - jamais supprimes), actifs (branches avec travail en cours), orphelins (la branche Git associee n'existe plus), stale (inactifs depuis plus de 30 jours), ou dirty (modifications locales non commitees). L'audit affiche un rapport complet avec recommandations. En mode interactif, elle propose de supprimer les worktrees orphelins et stale un par un avec confirmation. Elle doit etre executee depuis main ou develop pour eviter de supprimer le worktree courant. Cette commande est automatiquement appelee par /gitflow
|
|
2697
|
+
Cette commande de maintenance audite et nettoie les worktrees accumules au fil du temps. Elle categorise chaque worktree trouve : permanents (main, develop - jamais supprimes), actifs (branches avec travail en cours), orphelins (la branche Git associee n'existe plus), stale (inactifs depuis plus de 30 jours), ou dirty (modifications locales non commitees). L'audit affiche un rapport complet avec recommandations. En mode interactif, elle propose de supprimer les worktrees orphelins et stale un par un avec confirmation. Elle doit etre executee depuis main ou develop pour eviter de supprimer le worktree courant. Cette commande est automatiquement appelee par /gitflow finish et /gitflow abort pour maintenir l'environnement propre.
|
|
2535
2698
|
</p>
|
|
2536
2699
|
<p data-lang="en">
|
|
2537
|
-
This maintenance command audits and cleans up worktrees accumulated over time. It categorizes each found worktree: permanent (main, develop - never deleted), active (branches with ongoing work), orphan (associated Git branch no longer exists), stale (inactive for more than 30 days), or dirty (uncommitted local changes). The audit displays a complete report with recommendations. In interactive mode, it offers to delete orphan and stale worktrees one by one with confirmation. It must be run from main or develop to avoid deleting the current worktree. This command is automatically called by /gitflow
|
|
2700
|
+
This maintenance command audits and cleans up worktrees accumulated over time. It categorizes each found worktree: permanent (main, develop - never deleted), active (branches with ongoing work), orphan (associated Git branch no longer exists), stale (inactive for more than 30 days), or dirty (uncommitted local changes). The audit displays a complete report with recommendations. In interactive mode, it offers to delete orphan and stale worktrees one by one with confirmation. It must be run from main or develop to avoid deleting the current worktree. This command is automatically called by /gitflow finish and /gitflow abort to keep the environment clean.
|
|
2538
2701
|
</p>
|
|
2539
2702
|
<div class="code-block">
|
|
2540
2703
|
<button class="copy-btn">Copy</button>
|
|
2541
|
-
<pre><code>/gitflow
|
|
2704
|
+
<pre><code>/gitflow cleanup</code></pre>
|
|
2542
2705
|
</div>
|
|
2543
2706
|
</div>
|
|
2544
2707
|
</div>
|
|
@@ -2557,46 +2720,46 @@ git merge --no-ff feature/my-feature</code></pre>
|
|
|
2557
2720
|
<div class="code-block">
|
|
2558
2721
|
<button class="copy-btn">Copy</button>
|
|
2559
2722
|
<pre><code># 1. Initialiser GitFlow (une seule fois)
|
|
2560
|
-
/gitflow
|
|
2723
|
+
/gitflow init
|
|
2561
2724
|
|
|
2562
2725
|
# 2. Verifier l'etat du projet
|
|
2563
|
-
/gitflow
|
|
2726
|
+
/gitflow status
|
|
2564
2727
|
|
|
2565
2728
|
# 3. Demarrer une nouvelle feature
|
|
2566
|
-
/gitflow
|
|
2729
|
+
/gitflow start feature user-dashboard
|
|
2567
2730
|
|
|
2568
2731
|
# 4. Developper la feature...
|
|
2569
2732
|
# ... ecrire du code ...
|
|
2570
2733
|
|
|
2571
2734
|
# 5. Commits reguliers
|
|
2572
|
-
/gitflow
|
|
2735
|
+
/gitflow commit
|
|
2573
2736
|
|
|
2574
2737
|
# 6. Creer une Pull Request vers develop
|
|
2575
|
-
/gitflow
|
|
2738
|
+
/gitflow pr
|
|
2576
2739
|
|
|
2577
2740
|
# 7. Review de la PR (optionnel, peut etre fait par un collegue)
|
|
2578
|
-
/gitflow
|
|
2741
|
+
/gitflow merge 123
|
|
2579
2742
|
|
|
2580
2743
|
# 8. Merger la PR apres approbation
|
|
2581
|
-
/gitflow
|
|
2744
|
+
/gitflow merge 123
|
|
2582
2745
|
|
|
2583
2746
|
# 9. Preparer une release
|
|
2584
|
-
/gitflow
|
|
2747
|
+
/gitflow start release
|
|
2585
2748
|
|
|
2586
2749
|
# 10. Tests finaux et corrections mineures...
|
|
2587
|
-
/gitflow
|
|
2750
|
+
/gitflow commit
|
|
2588
2751
|
|
|
2589
2752
|
# 11. Creer PR vers main et merger
|
|
2590
|
-
/gitflow
|
|
2591
|
-
/gitflow
|
|
2753
|
+
/gitflow pr main
|
|
2754
|
+
/gitflow merge 456
|
|
2592
2755
|
|
|
2593
2756
|
# 12. Finaliser la release (tag + merge back + cleanup auto)
|
|
2594
|
-
/gitflow
|
|
2757
|
+
/gitflow finish
|
|
2595
2758
|
|
|
2596
2759
|
# La release est maintenant sur main avec un tag!
|
|
2597
2760
|
|
|
2598
2761
|
# 13. Maintenance: Audit des worktrees (depuis main ou develop)
|
|
2599
|
-
/gitflow
|
|
2762
|
+
/gitflow cleanup</code></pre>
|
|
2600
2763
|
</div>
|
|
2601
2764
|
|
|
2602
2765
|
<div class="alert alert-info">
|