@atlashub/smartstack-cli 1.13.2 → 1.14.1
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/agents.html +1 -1
- package/.documentation/apex.html +1 -1
- package/.documentation/business-analyse.html +1 -1
- package/.documentation/cli-commands.html +3 -3
- package/.documentation/commands.html +1 -1
- package/.documentation/efcore.html +1 -1
- package/.documentation/gitflow.html +231 -236
- package/.documentation/hooks.html +1 -1
- package/.documentation/index.html +1 -1
- package/.documentation/init.html +3 -3
- package/.documentation/installation.html +1075 -351
- package/.documentation/ralph-loop.html +1 -1
- package/.documentation/test-web.html +1 -1
- package/README.md +88 -20
- package/config/default-config.json +10 -1
- package/dist/index.js +276 -85
- package/dist/index.js.map +1 -1
- package/package.json +1 -1
- package/templates/agents/code-reviewer.md +163 -0
- package/templates/agents/efcore/db-deploy.md +25 -7
- package/templates/agents/efcore/db-reset.md +31 -10
- package/templates/agents/efcore/db-status.md +22 -5
- package/templates/agents/efcore/migration.md +70 -20
- package/templates/agents/gitflow/cleanup.md +8 -1
- package/templates/agents/gitflow/commit.md +7 -5
- package/templates/agents/gitflow/finish.md +6 -4
- package/templates/agents/gitflow/pr.md +8 -1
- package/templates/agents/gitflow/start.md +1 -1
- package/templates/commands/check-version.md +267 -0
- package/templates/commands/efcore/_shared.md +31 -2
- package/templates/commands/efcore/db-reset.md +18 -6
- 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/commands/refactor.md +164 -0
- package/templates/project/DependencyInjection.Application.cs.template +25 -0
- package/templates/project/DependencyInjection.Infrastructure.cs.template +61 -0
- package/templates/project/DesignTimeExtensionsDbContextFactory.cs.template +70 -0
- package/templates/project/ExampleEntity.cs.template +116 -0
- package/templates/project/ExampleEntityConfiguration.cs.template +64 -0
- package/templates/project/ExampleService.cs.template +146 -0
- package/templates/project/ExtensionsDbContext.cs.template +41 -0
- package/templates/project/IExtensionsDbContext.cs.template +22 -0
- package/templates/project/Program.cs.template +47 -0
- package/templates/project/README.md +79 -0
- package/templates/ralph/README.md +10 -8
- package/templates/ralph/ralph.config.yaml +2 -2
- package/templates/skills/_shared.md +44 -44
- package/templates/skills/ai-prompt/SKILL.md +55 -55
- package/templates/skills/apex/SKILL.md +235 -0
- package/templates/skills/apex/steps/step-00-init.md +203 -0
- package/templates/skills/apex/steps/step-01-analyze.md +210 -0
- package/templates/skills/apex/steps/step-02-plan.md +217 -0
- package/templates/skills/apex/steps/step-03-execute.md +178 -0
- package/templates/skills/apex/steps/step-04-validate.md +217 -0
- package/templates/skills/apex/steps/step-05-examine.md +207 -0
- package/templates/skills/apex/steps/step-06-resolve.md +181 -0
- package/templates/skills/apex/steps/step-07-tests.md +206 -0
- package/templates/skills/apex/steps/step-08-run-tests.md +207 -0
- package/templates/skills/apex/templates/00-context.md +46 -0
- package/templates/skills/apex/templates/01-analyze.md +63 -0
- package/templates/skills/apex/templates/02-plan.md +63 -0
- package/templates/skills/apex/templates/03-execute.md +34 -0
- package/templates/skills/apex/templates/04-validate.md +61 -0
- package/templates/skills/apex/templates/05-examine.md +58 -0
- package/templates/skills/apex/templates/06-resolve.md +39 -0
- package/templates/skills/apex/templates/07-tests.md +56 -0
- package/templates/skills/apex/templates/08-run-tests.md +41 -0
- package/templates/skills/apex/templates/README.md +69 -0
- package/templates/skills/application/SKILL.md +50 -50
- package/templates/skills/application/templates-backend.md +25 -25
- package/templates/skills/application/templates-frontend.md +43 -43
- package/templates/skills/application/templates-i18n.md +29 -29
- package/templates/skills/application/templates-seed.md +77 -77
- package/templates/skills/business-analyse/SKILL.md +223 -0
- package/templates/skills/business-analyse/_shared.md +258 -0
- package/templates/skills/business-analyse/questionnaire/01-context.md +33 -0
- package/templates/skills/business-analyse/questionnaire/02-stakeholders.md +35 -0
- package/templates/skills/business-analyse/questionnaire/03-scope.md +35 -0
- package/templates/skills/business-analyse/questionnaire/04-data.md +36 -0
- package/templates/skills/business-analyse/questionnaire/05-integrations.md +36 -0
- package/templates/skills/business-analyse/questionnaire/06-security.md +40 -0
- package/templates/skills/business-analyse/questionnaire/07-ui.md +36 -0
- package/templates/skills/business-analyse/questionnaire/08-performance.md +35 -0
- package/templates/skills/business-analyse/questionnaire/09-constraints.md +35 -0
- package/templates/skills/business-analyse/questionnaire/10-documentation.md +35 -0
- package/templates/skills/business-analyse/questionnaire.md +177 -177
- package/templates/skills/business-analyse/react/components.md +340 -0
- package/templates/skills/business-analyse/react/i18n-template.md +245 -0
- package/templates/skills/business-analyse/react/schema.md +151 -0
- package/templates/skills/business-analyse/steps/step-00-init.md +293 -0
- package/templates/skills/business-analyse/steps/step-01-discover.md +267 -0
- package/templates/skills/business-analyse/steps/step-02-analyse.md +243 -0
- package/templates/skills/business-analyse/steps/step-03-specify.md +317 -0
- package/templates/skills/business-analyse/steps/step-04-validate.md +239 -0
- package/templates/skills/business-analyse/steps/step-05-handoff.md +336 -0
- package/templates/skills/business-analyse/steps/step-06-doc-html.md +261 -0
- package/templates/skills/business-analyse/templates/00-context.md +105 -0
- package/templates/skills/business-analyse/templates/frd-brd.md +97 -0
- package/templates/skills/business-analyse/templates/frd-discovery.md +78 -0
- package/templates/skills/business-analyse/templates/frd-handoff.md +118 -0
- package/templates/skills/business-analyse/templates/frd-spec.md +168 -0
- package/templates/skills/business-analyse/templates-frd.md +217 -217
- package/templates/skills/business-analyse/templates-react.md +26 -26
- package/templates/skills/controller/SKILL.md +141 -92
- package/templates/skills/controller/postman-templates.md +15 -15
- package/templates/skills/controller/steps/step-00-init.md +191 -0
- package/templates/skills/controller/steps/step-01-analyze.md +146 -0
- package/templates/skills/controller/steps/step-02-plan.md +176 -0
- package/templates/skills/controller/steps/step-03-generate.md +219 -0
- package/templates/skills/controller/steps/step-04-perms.md +219 -0
- package/templates/skills/controller/steps/step-05-validate.md +107 -0
- package/templates/skills/controller/templates.md +77 -77
- package/templates/skills/documentation/SKILL.md +79 -79
- package/templates/skills/feature-full/SKILL.md +38 -38
- package/templates/skills/gitflow/SKILL.md +277 -0
- package/templates/{commands → skills}/gitflow/_shared.md +20 -20
- package/templates/skills/gitflow/phases/abort.md +173 -0
- package/templates/skills/gitflow/phases/cleanup.md +226 -0
- package/templates/skills/gitflow/phases/status.md +178 -0
- package/templates/skills/gitflow/steps/step-commit.md +255 -0
- package/templates/skills/gitflow/steps/step-finish.md +255 -0
- package/templates/skills/gitflow/steps/step-init.md +209 -0
- package/templates/skills/gitflow/steps/step-merge.md +225 -0
- package/templates/skills/gitflow/steps/step-plan.md +208 -0
- package/templates/skills/gitflow/steps/step-pr.md +235 -0
- package/templates/skills/gitflow/steps/step-start.md +334 -0
- package/templates/skills/gitflow/steps/step-sync.md +200 -0
- package/templates/skills/gitflow/templates/config.json +53 -0
- package/templates/skills/notification/SKILL.md +51 -51
- package/templates/skills/ralph-loop/SKILL.md +228 -0
- package/templates/skills/ralph-loop/steps/step-00-init.md +201 -0
- package/templates/skills/ralph-loop/steps/step-01-task.md +169 -0
- package/templates/skills/ralph-loop/steps/step-02-execute.md +173 -0
- package/templates/skills/ralph-loop/steps/step-03-commit.md +170 -0
- package/templates/skills/ralph-loop/steps/step-04-check.md +162 -0
- package/templates/skills/ralph-loop/steps/step-05-report.md +181 -0
- package/templates/skills/review-code/SKILL.md +219 -0
- package/templates/skills/review-code/references/clean-code-principles.md +140 -0
- package/templates/skills/review-code/references/code-quality-metrics.md +174 -0
- package/templates/skills/review-code/references/feedback-patterns.md +149 -0
- package/templates/skills/review-code/references/security-checklist.md +127 -0
- package/templates/skills/ui-components/SKILL.md +54 -54
- package/templates/skills/workflow/SKILL.md +46 -46
- package/templates/commands/ai-prompt.md +0 -315
- package/templates/commands/apex/1-analyze.md +0 -100
- package/templates/commands/apex/2-plan.md +0 -145
- package/templates/commands/apex/3-execute.md +0 -171
- package/templates/commands/apex/4-examine.md +0 -116
- package/templates/commands/apex/5-tasks.md +0 -209
- package/templates/commands/apex.md +0 -76
- package/templates/commands/application/create.md +0 -362
- package/templates/commands/application/templates-backend.md +0 -463
- package/templates/commands/application/templates-frontend.md +0 -517
- package/templates/commands/application/templates-i18n.md +0 -478
- package/templates/commands/application/templates-seed.md +0 -362
- package/templates/commands/application.md +0 -303
- package/templates/commands/business-analyse/0-orchestrate.md +0 -156
- package/templates/commands/business-analyse/1-init.md +0 -99
- package/templates/commands/business-analyse/2-discover.md +0 -143
- package/templates/commands/business-analyse/3-analyse.md +0 -106
- package/templates/commands/business-analyse/4-specify.md +0 -133
- package/templates/commands/business-analyse/5-validate.md +0 -132
- package/templates/commands/business-analyse/6-handoff.md +0 -157
- package/templates/commands/business-analyse/7-doc-html.md +0 -103
- package/templates/commands/business-analyse/_shared.md +0 -176
- package/templates/commands/business-analyse/bug.md +0 -118
- package/templates/commands/business-analyse/change-request.md +0 -144
- package/templates/commands/business-analyse/hotfix.md +0 -116
- package/templates/commands/business-analyse.md +0 -121
- package/templates/commands/controller/create.md +0 -216
- package/templates/commands/controller/postman-templates.md +0 -528
- package/templates/commands/controller/templates.md +0 -600
- package/templates/commands/controller.md +0 -337
- package/templates/commands/create/agent.md +0 -138
- package/templates/commands/create/command.md +0 -166
- package/templates/commands/create/hook.md +0 -234
- package/templates/commands/create/plugin.md +0 -329
- package/templates/commands/create/project.md +0 -508
- package/templates/commands/create/skill.md +0 -199
- package/templates/commands/create.md +0 -220
- package/templates/commands/documentation/module.md +0 -202
- package/templates/commands/documentation/templates.md +0 -432
- package/templates/commands/documentation.md +0 -190
- package/templates/commands/epct.md +0 -69
- package/templates/commands/explain.md +0 -186
- package/templates/commands/feature-full.md +0 -267
- package/templates/commands/gitflow/1-init.md +0 -188
- package/templates/commands/gitflow/10-start.md +0 -190
- package/templates/commands/gitflow/11-finish.md +0 -382
- package/templates/commands/gitflow/12-cleanup.md +0 -103
- package/templates/commands/gitflow/13-sync.md +0 -216
- package/templates/commands/gitflow/14-rebase.md +0 -251
- package/templates/commands/gitflow/2-status.md +0 -122
- package/templates/commands/gitflow/3-commit.md +0 -209
- package/templates/commands/gitflow/4-plan.md +0 -174
- package/templates/commands/gitflow/5-exec.md +0 -202
- package/templates/commands/gitflow/6-abort.md +0 -121
- package/templates/commands/gitflow/7-pull-request.md +0 -176
- package/templates/commands/gitflow/8-review.md +0 -113
- package/templates/commands/gitflow/9-merge.md +0 -157
- package/templates/commands/gitflow.md +0 -128
- package/templates/commands/implement.md +0 -663
- package/templates/commands/init.md +0 -567
- package/templates/commands/mcp-integration.md +0 -330
- package/templates/commands/notification.md +0 -129
- package/templates/commands/oneshot.md +0 -57
- package/templates/commands/quickstart.md +0 -154
- package/templates/commands/ralph-loop/cancel-ralph.md +0 -18
- package/templates/commands/ralph-loop/help.md +0 -126
- package/templates/commands/ralph-loop/ralph-loop.md +0 -120
- package/templates/commands/review.md +0 -106
- package/templates/commands/workflow.md +0 -193
- 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.
|
|
15
|
+
<span class="version-badge">v1.14.0</span>
|
|
16
16
|
<div class="header-divider"></div>
|
|
17
17
|
<span class="page-title">GitFlow Workflow</span>
|
|
18
18
|
<nav class="breadcrumb">
|
|
@@ -419,7 +419,7 @@
|
|
|
419
419
|
data-title-en="Main branch (production)"
|
|
420
420
|
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
421
|
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
|
|
422
|
+
data-cmd="/gitflow status">
|
|
423
423
|
<text x="30" y="55" fill="#ef4444" font-weight="600" font-size="14">main</text>
|
|
424
424
|
<line x1="100" y1="50" x2="850" y2="50" stroke="#ef4444" stroke-width="3" stroke-linecap="round"/>
|
|
425
425
|
<!-- Invisible hit area -->
|
|
@@ -432,7 +432,7 @@
|
|
|
432
432
|
data-title-en="Develop branch (integration)"
|
|
433
433
|
data-desc-fr="Branche d'integration recevant toutes les features terminees. Base pour les nouvelles features et releases. Doit toujours etre stable."
|
|
434
434
|
data-desc-en="Integration branch receiving all completed features. Base for new features and releases. Must always be stable."
|
|
435
|
-
data-cmd="/gitflow
|
|
435
|
+
data-cmd="/gitflow status">
|
|
436
436
|
<text x="30" y="175" fill="#f97316" font-weight="600" font-size="14">develop</text>
|
|
437
437
|
<line x1="100" y1="170" x2="850" y2="170" stroke="#f97316" stroke-width="3" stroke-linecap="round"/>
|
|
438
438
|
<rect x="25" y="155" width="830" height="30" fill="transparent" class="hit-area"/>
|
|
@@ -444,7 +444,7 @@
|
|
|
444
444
|
data-title-en="Release line"
|
|
445
445
|
data-desc-fr="Zone de preparation des releases avant deploiement. Permet de finaliser une version sans bloquer le developpement."
|
|
446
446
|
data-desc-en="Release preparation zone before deployment. Allows finalizing a version without blocking development."
|
|
447
|
-
data-cmd="/gitflow
|
|
447
|
+
data-cmd="/gitflow start release">
|
|
448
448
|
<text x="30" y="115" fill="#eab308" font-weight="600" font-size="14">release</text>
|
|
449
449
|
<rect x="25" y="100" width="60" height="25" fill="transparent" class="hit-area"/>
|
|
450
450
|
</g>
|
|
@@ -455,7 +455,7 @@
|
|
|
455
455
|
data-title-en="Feature line"
|
|
456
456
|
data-desc-fr="Zone de developpement des nouvelles fonctionnalites. Chaque feature a sa branche creee depuis develop."
|
|
457
457
|
data-desc-en="Development zone for new features. Each feature has its branch created from develop."
|
|
458
|
-
data-cmd="/gitflow
|
|
458
|
+
data-cmd="/gitflow start feature {nom}">
|
|
459
459
|
<text x="30" y="235" fill="#22c55e" font-weight="600" font-size="14">feature</text>
|
|
460
460
|
<rect x="25" y="220" width="60" height="25" fill="transparent" class="hit-area"/>
|
|
461
461
|
</g>
|
|
@@ -466,7 +466,7 @@
|
|
|
466
466
|
data-title-en="Hotfix line"
|
|
467
467
|
data-desc-fr="Zone pour les corrections urgentes en production. Creee depuis main, mergee dans main ET develop."
|
|
468
468
|
data-desc-en="Zone for urgent production fixes. Created from main, merged into main AND develop."
|
|
469
|
-
data-cmd="/gitflow
|
|
469
|
+
data-cmd="/gitflow start hotfix {nom}">
|
|
470
470
|
<text x="30" y="295" fill="#ec4899" font-weight="600" font-size="14">hotfix</text>
|
|
471
471
|
<rect x="25" y="280" width="60" height="25" fill="transparent" class="hit-area"/>
|
|
472
472
|
</g>
|
|
@@ -477,7 +477,7 @@
|
|
|
477
477
|
data-title-en="Feature A"
|
|
478
478
|
data-desc-fr="Branche de developpement d'une fonctionnalite. Contient plusieurs commits de travail avant d'etre mergee dans develop."
|
|
479
479
|
data-desc-en="Feature development branch. Contains multiple work commits before being merged into develop."
|
|
480
|
-
data-cmd="/gitflow
|
|
480
|
+
data-cmd="/gitflow start feature {nom}">
|
|
481
481
|
<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
482
|
<text x="260" y="260" fill="#94a3b8" font-size="11">feature/a</text>
|
|
483
483
|
<circle cx="260" cy="230" r="6" fill="#22c55e"/>
|
|
@@ -491,7 +491,7 @@
|
|
|
491
491
|
data-title-en="Feature B"
|
|
492
492
|
data-desc-fr="Deuxieme feature en parallele. Les features peuvent etre developpees simultanement par differents developpeurs sans conflit."
|
|
493
493
|
data-desc-en="Second feature in parallel. Features can be developed simultaneously by different developers without conflict."
|
|
494
|
-
data-cmd="/gitflow
|
|
494
|
+
data-cmd="/gitflow start feature {nom}">
|
|
495
495
|
<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
496
|
<text x="480" y="260" fill="#94a3b8" font-size="11">feature/b</text>
|
|
497
497
|
<circle cx="480" cy="230" r="6" fill="#22c55e"/>
|
|
@@ -505,7 +505,7 @@
|
|
|
505
505
|
data-title-en="Release branch v1.0"
|
|
506
506
|
data-desc-fr="Preparation de la version 1.0. Permet les derniers ajustements (bugfix, doc) avant deploiement en production."
|
|
507
507
|
data-desc-en="Preparation of version 1.0. Allows final adjustments (bugfix, docs) before production deployment."
|
|
508
|
-
data-cmd="/gitflow
|
|
508
|
+
data-cmd="/gitflow start release">
|
|
509
509
|
<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
510
|
<text x="470" y="95" fill="#94a3b8" font-size="11">release/v1.0</text>
|
|
511
511
|
<circle cx="500" cy="110" r="6" fill="#eab308"/>
|
|
@@ -518,7 +518,7 @@
|
|
|
518
518
|
data-title-en="Merge back release → develop"
|
|
519
519
|
data-desc-fr="Synchronisation de la release vers develop. Apres merge dans main, les changements doivent aussi aller dans develop."
|
|
520
520
|
data-desc-en="Sync release to develop. After merging into main, changes must also go into develop."
|
|
521
|
-
data-cmd="/gitflow
|
|
521
|
+
data-cmd="/gitflow finish">
|
|
522
522
|
<path d="M 600 50 L 600 170" stroke="#eab308" stroke-width="2" stroke-dasharray="5,5" fill="none"/>
|
|
523
523
|
<rect x="590" y="45" width="20" height="130" fill="transparent" class="hit-area"/>
|
|
524
524
|
</g>
|
|
@@ -529,7 +529,7 @@
|
|
|
529
529
|
data-title-en="Hotfix branch bug"
|
|
530
530
|
data-desc-fr="Correction urgente d'un bug en production. Increment automatique du PATCH (1.0.0 → 1.0.1)."
|
|
531
531
|
data-desc-en="Urgent fix for a production bug. Automatic PATCH increment (1.0.0 → 1.0.1)."
|
|
532
|
-
data-cmd="/gitflow
|
|
532
|
+
data-cmd="/gitflow start hotfix {nom}">
|
|
533
533
|
<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
534
|
<text x="720" y="310" fill="#94a3b8" font-size="11">hotfix/bug</text>
|
|
535
535
|
<circle cx="750" cy="290" r="6" fill="#ec4899"/>
|
|
@@ -542,7 +542,7 @@
|
|
|
542
542
|
data-title-en="Merge back hotfix → develop"
|
|
543
543
|
data-desc-fr="Synchronisation du hotfix vers develop. CRITIQUE pour eviter de regresser dans les futures versions."
|
|
544
544
|
data-desc-en="Sync hotfix to develop. CRITICAL to avoid regression in future versions."
|
|
545
|
-
data-cmd="/gitflow
|
|
545
|
+
data-cmd="/gitflow finish">
|
|
546
546
|
<path d="M 780 290 L 820 170" stroke="#ec4899" stroke-width="2" stroke-dasharray="4,3"/>
|
|
547
547
|
<rect x="775" y="165" width="55" height="135" fill="transparent" class="hit-area"/>
|
|
548
548
|
</g>
|
|
@@ -553,7 +553,7 @@
|
|
|
553
553
|
data-title-en="Commit on main"
|
|
554
554
|
data-desc-fr="Commit sur main. Les commits viennent uniquement des merges de release ou hotfix, jamais de push direct."
|
|
555
555
|
data-desc-en="Commit on main. Commits only come from release or hotfix merges, never from direct push."
|
|
556
|
-
data-cmd="/gitflow
|
|
556
|
+
data-cmd="/gitflow commit">
|
|
557
557
|
<circle cx="150" cy="50" r="8" fill="#ef4444" filter="url(#glow)"/>
|
|
558
558
|
<rect x="140" y="38" width="20" height="24" fill="transparent" class="hit-area"/>
|
|
559
559
|
</g>
|
|
@@ -564,7 +564,7 @@
|
|
|
564
564
|
data-title-en="Merge release → main"
|
|
565
565
|
data-desc-fr="Commit de merge de la release dans main. La bordure jaune = source release. Tag v1.0 cree automatiquement."
|
|
566
566
|
data-desc-en="Release merge commit into main. Yellow border = release source. Tag v1.0 automatically created."
|
|
567
|
-
data-cmd="/gitflow
|
|
567
|
+
data-cmd="/gitflow finish">
|
|
568
568
|
<circle cx="600" cy="50" r="10" fill="#ef4444" stroke="#eab308" stroke-width="3" filter="url(#glow)"/>
|
|
569
569
|
<rect x="588" y="38" width="24" height="24" fill="transparent" class="hit-area"/>
|
|
570
570
|
</g>
|
|
@@ -575,7 +575,7 @@
|
|
|
575
575
|
data-title-en="Merge hotfix → main"
|
|
576
576
|
data-desc-fr="Commit de merge du hotfix dans main. La bordure rose = source hotfix. Tag v1.0.1 (patch) cree automatiquement."
|
|
577
577
|
data-desc-en="Hotfix merge commit into main. Pink border = hotfix source. Tag v1.0.1 (patch) automatically created."
|
|
578
|
-
data-cmd="/gitflow
|
|
578
|
+
data-cmd="/gitflow finish">
|
|
579
579
|
<circle cx="800" cy="50" r="10" fill="#ef4444" stroke="#ec4899" stroke-width="3" filter="url(#glow)"/>
|
|
580
580
|
<rect x="788" y="38" width="24" height="24" fill="transparent" class="hit-area"/>
|
|
581
581
|
</g>
|
|
@@ -586,7 +586,7 @@
|
|
|
586
586
|
data-title-en="Tag v1.0"
|
|
587
587
|
data-desc-fr="Tag Git marquant cette version en production. Cree automatiquement lors du finish. Format: v{MAJOR}.{MINOR}.{PATCH}"
|
|
588
588
|
data-desc-en="Git tag marking this version in production. Automatically created on finish. Format: v{MAJOR}.{MINOR}.{PATCH}"
|
|
589
|
-
data-cmd="/gitflow
|
|
589
|
+
data-cmd="/gitflow finish">
|
|
590
590
|
<g transform="translate(600, 20)">
|
|
591
591
|
<rect x="-20" y="-12" width="40" height="18" rx="4" fill="#eab308"/>
|
|
592
592
|
<text x="0" y="2" fill="#0f172a" font-size="10" font-weight="600" text-anchor="middle">v1.0</text>
|
|
@@ -600,7 +600,7 @@
|
|
|
600
600
|
data-title-en="Tag v1.0.1 (patch)"
|
|
601
601
|
data-desc-fr="Tag de version patch cree par le hotfix. Increment automatique: 1.0.0 → 1.0.1. Correction sans nouvelles features."
|
|
602
602
|
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
|
|
603
|
+
data-cmd="/gitflow finish">
|
|
604
604
|
<g transform="translate(800, 20)">
|
|
605
605
|
<rect x="-24" y="-12" width="48" height="18" rx="4" fill="#ec4899"/>
|
|
606
606
|
<text x="0" y="2" fill="#0f172a" font-size="10" font-weight="600" text-anchor="middle">v1.0.1</text>
|
|
@@ -614,7 +614,7 @@
|
|
|
614
614
|
data-title-en="Merge feature/a → develop"
|
|
615
615
|
data-desc-fr="Commit de merge de la feature A dans develop. La bordure verte = merge de feature."
|
|
616
616
|
data-desc-en="Feature A merge commit into develop. Green border = feature merge."
|
|
617
|
-
data-cmd="/gitflow
|
|
617
|
+
data-cmd="/gitflow merge">
|
|
618
618
|
<circle cx="360" cy="170" r="8" fill="#f97316" stroke="#22c55e" stroke-width="2"/>
|
|
619
619
|
<rect x="350" y="160" width="20" height="20" fill="transparent" class="hit-area"/>
|
|
620
620
|
</g>
|
|
@@ -625,7 +625,7 @@
|
|
|
625
625
|
data-title-en="Merge feature/b → develop"
|
|
626
626
|
data-desc-fr="Commit de merge de la feature B dans develop. Plusieurs features peuvent etre mergees independamment."
|
|
627
627
|
data-desc-en="Feature B merge commit into develop. Multiple features can be merged independently."
|
|
628
|
-
data-cmd="/gitflow
|
|
628
|
+
data-cmd="/gitflow merge">
|
|
629
629
|
<circle cx="580" cy="170" r="8" fill="#f97316" stroke="#22c55e" stroke-width="2"/>
|
|
630
630
|
<rect x="570" y="160" width="20" height="20" fill="transparent" class="hit-area"/>
|
|
631
631
|
</g>
|
|
@@ -636,7 +636,7 @@
|
|
|
636
636
|
data-title-en="Merge back release → develop"
|
|
637
637
|
data-desc-fr="Commit de synchronisation de la release vers develop. Les bugfix sont integres dans develop."
|
|
638
638
|
data-desc-en="Release sync commit to develop. Bugfixes are integrated into develop."
|
|
639
|
-
data-cmd="/gitflow
|
|
639
|
+
data-cmd="/gitflow finish">
|
|
640
640
|
<circle cx="600" cy="170" r="8" fill="#f97316" stroke="#eab308" stroke-width="2"/>
|
|
641
641
|
<rect x="590" y="160" width="20" height="20" fill="transparent" class="hit-area"/>
|
|
642
642
|
</g>
|
|
@@ -647,7 +647,7 @@
|
|
|
647
647
|
data-title-en="Merge back hotfix → develop"
|
|
648
648
|
data-desc-fr="Commit de synchronisation du hotfix vers develop. ESSENTIEL pour eviter regression."
|
|
649
649
|
data-desc-en="Hotfix sync commit to develop. ESSENTIAL to avoid regression."
|
|
650
|
-
data-cmd="/gitflow
|
|
650
|
+
data-cmd="/gitflow finish">
|
|
651
651
|
<circle cx="820" cy="170" r="8" fill="#f97316" stroke="#ec4899" stroke-width="2"/>
|
|
652
652
|
<rect x="810" y="160" width="20" height="20" fill="transparent" class="hit-area"/>
|
|
653
653
|
</g>
|
|
@@ -663,7 +663,7 @@
|
|
|
663
663
|
data-title-en="Merge arrow"
|
|
664
664
|
data-desc-fr="Direction du merge: de la feature vers develop. Utilise --no-ff pour preserver l'historique."
|
|
665
665
|
data-desc-en="Merge direction: from feature to develop. Uses --no-ff to preserve history."
|
|
666
|
-
data-cmd="/gitflow
|
|
666
|
+
data-cmd="/gitflow merge">
|
|
667
667
|
<path d="M 360 230 L 360 178" stroke="#22c55e" stroke-width="2" marker-end="url(#arrow)"/>
|
|
668
668
|
<path d="M 580 230 L 580 178" stroke="#22c55e" stroke-width="2" marker-end="url(#arrow)"/>
|
|
669
669
|
<rect x="355" y="175" width="10" height="60" fill="transparent" class="hit-area"/>
|
|
@@ -812,13 +812,13 @@
|
|
|
812
812
|
<h5 data-lang="fr">Deux methodes d'integration</h5>
|
|
813
813
|
<h5 data-lang="en">Two Integration Methods</h5>
|
|
814
814
|
<div data-lang="fr">
|
|
815
|
-
<p><strong>1. Methode PR (Recommandee)</strong> : <code>/gitflow
|
|
815
|
+
<p><strong>1. Methode PR (Recommandee)</strong> : <code>/gitflow pr</code> → <code>/gitflow finish</code></p>
|
|
816
816
|
<ul style="margin: 0.5rem 0; padding-left: 1.5rem;">
|
|
817
817
|
<li>Cree une Pull Request pour revue de code</li>
|
|
818
|
-
<li>Apres merge de la PR, <code>/gitflow
|
|
818
|
+
<li>Apres merge de la PR, <code>/gitflow finish</code> supprime la branche locale ET remote</li>
|
|
819
819
|
<li><strong>A utiliser pour</strong> : features, releases, hotfixes</li>
|
|
820
820
|
</ul>
|
|
821
|
-
<p style="margin-top: 1rem;"><strong>2. Methode directe (Legacy)</strong> : <code>/gitflow
|
|
821
|
+
<p style="margin-top: 1rem;"><strong>2. Methode directe (Legacy)</strong> : <code>/gitflow plan</code> → <code>/gitflow merge</code></p>
|
|
822
822
|
<ul style="margin: 0.5rem 0; padding-left: 1.5rem;">
|
|
823
823
|
<li>Merge directement sans Pull Request</li>
|
|
824
824
|
<li>Utile pour les projets solo ou CI/CD automatise</li>
|
|
@@ -826,13 +826,13 @@
|
|
|
826
826
|
</ul>
|
|
827
827
|
</div>
|
|
828
828
|
<div data-lang="en">
|
|
829
|
-
<p><strong>1. PR Method (Recommended)</strong>: <code>/gitflow
|
|
829
|
+
<p><strong>1. PR Method (Recommended)</strong>: <code>/gitflow pr</code> → <code>/gitflow finish</code></p>
|
|
830
830
|
<ul style="margin: 0.5rem 0; padding-left: 1.5rem;">
|
|
831
831
|
<li>Creates a Pull Request for code review</li>
|
|
832
|
-
<li>After PR merge, <code>/gitflow
|
|
832
|
+
<li>After PR merge, <code>/gitflow finish</code> deletes both local AND remote branches</li>
|
|
833
833
|
<li><strong>Use for</strong>: features, releases, hotfixes</li>
|
|
834
834
|
</ul>
|
|
835
|
-
<p style="margin-top: 1rem;"><strong>2. Direct Method (Legacy)</strong>: <code>/gitflow
|
|
835
|
+
<p style="margin-top: 1rem;"><strong>2. Direct Method (Legacy)</strong>: <code>/gitflow plan</code> → <code>/gitflow merge</code></p>
|
|
836
836
|
<ul style="margin: 0.5rem 0; padding-left: 1.5rem;">
|
|
837
837
|
<li>Merges directly without Pull Request</li>
|
|
838
838
|
<li>Useful for solo projects or automated CI/CD</li>
|
|
@@ -849,21 +849,21 @@
|
|
|
849
849
|
<h5 data-lang="fr">Suppression des branches remote</h5>
|
|
850
850
|
<h5 data-lang="en">Remote Branch Deletion</h5>
|
|
851
851
|
<p data-lang="fr">
|
|
852
|
-
<code>/gitflow
|
|
853
|
-
Pour un nettoyage complet des worktrees orphelins, utilisez <code>/gitflow
|
|
852
|
+
<code>/gitflow finish</code> supprime automatiquement la branche sur le remote (<code>git push origin --delete {branch}</code>).
|
|
853
|
+
Pour un nettoyage complet des worktrees orphelins, utilisez <code>/gitflow cleanup</code>.
|
|
854
854
|
</p>
|
|
855
855
|
<p data-lang="en">
|
|
856
|
-
<code>/gitflow
|
|
857
|
-
For complete cleanup of orphan worktrees, use <code>/gitflow
|
|
856
|
+
<code>/gitflow finish</code> automatically deletes the remote branch (<code>git push origin --delete {branch}</code>).
|
|
857
|
+
For complete cleanup of orphan worktrees, use <code>/gitflow cleanup</code>.
|
|
858
858
|
</p>
|
|
859
859
|
</div>
|
|
860
860
|
</div>
|
|
861
861
|
|
|
862
862
|
<!-- Decision Flowchart SVG - Responsive -->
|
|
863
863
|
<div class="decision-diagram" style="margin: 2rem 0;">
|
|
864
|
-
<svg viewBox="0 0 1200
|
|
864
|
+
<svg viewBox="0 0 1200 900" preserveAspectRatio="xMidYMid meet" style="width: 100%; height: auto; display: block;">
|
|
865
865
|
<!-- Background -->
|
|
866
|
-
<rect width="1200" height="
|
|
866
|
+
<rect width="1200" height="900" fill="#0f172a" rx="8"/>
|
|
867
867
|
|
|
868
868
|
<!-- Title -->
|
|
869
869
|
<text x="500" y="40" text-anchor="middle" fill="#f8fafc" font-size="22" font-weight="600">
|
|
@@ -878,111 +878,106 @@
|
|
|
878
878
|
<tspan data-lang="en">Goal</tspan>
|
|
879
879
|
</text>
|
|
880
880
|
|
|
881
|
-
<!-- FEATURE PATH (Left) -
|
|
882
|
-
<line x1="380" y1="130" x2="
|
|
883
|
-
<
|
|
881
|
+
<!-- FEATURE PATH (Left) - Aligned with Release/Hotfix -->
|
|
882
|
+
<line x1="380" y1="130" x2="380" y2="220" stroke="#22c55e" stroke-width="2.5"/>
|
|
883
|
+
<line x1="380" y1="220" x2="120" y2="220" stroke="#22c55e" stroke-width="2.5"/>
|
|
884
|
+
<line x1="120" y1="220" x2="120" y2="250" stroke="#22c55e" stroke-width="2.5"/>
|
|
885
|
+
<polygon points="120,250 114,236 126,236" fill="#22c55e"/>
|
|
884
886
|
|
|
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>
|
|
887
|
+
<rect x="30" y="255" width="180" height="55" rx="8" fill="#22c55e" fill-opacity="0.15" stroke="#22c55e" stroke-width="2.5"/>
|
|
888
|
+
<text x="120" y="280" text-anchor="middle" fill="#22c55e" font-size="13" font-weight="600">
|
|
889
|
+
<tspan data-lang="fr">Nouvelle fonctionnalite</tspan>
|
|
890
|
+
<tspan data-lang="en">New feature</tspan>
|
|
893
891
|
</text>
|
|
892
|
+
<text x="120" y="298" text-anchor="middle" fill="#94a3b8" font-size="10">(feature)</text>
|
|
894
893
|
|
|
895
894
|
<!-- Feature flow down -->
|
|
896
|
-
<line x1="120" y1="
|
|
897
|
-
<polygon points="120,
|
|
895
|
+
<line x1="120" y1="310" x2="120" y2="335" stroke="#22c55e" stroke-width="2.5"/>
|
|
896
|
+
<polygon points="120,335 114,321 126,321" fill="#22c55e"/>
|
|
898
897
|
|
|
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>
|
|
898
|
+
<g class="cmd-copyable" data-cmd="/gitflow start feature {nom}" style="cursor:pointer;">
|
|
899
|
+
<rect x="30" y="340" width="180" height="40" rx="6" fill="#0f172a" stroke="#22c55e" stroke-width="2"/>
|
|
900
|
+
<text x="120" y="365" text-anchor="middle" fill="#22c55e" font-size="11" font-family="monospace">/gitflow start feature</text>
|
|
903
901
|
</g>
|
|
904
902
|
|
|
905
|
-
<line x1="120" y1="
|
|
906
|
-
<text x="120" y="
|
|
903
|
+
<line x1="120" y1="380" x2="120" y2="410" stroke="#22c55e" stroke-width="2.5" stroke-dasharray="5,3"/>
|
|
904
|
+
<text x="120" y="430" text-anchor="middle" fill="#64748b" font-size="11" font-style="italic">
|
|
907
905
|
<tspan data-lang="fr">coder...</tspan>
|
|
908
906
|
<tspan data-lang="en">code...</tspan>
|
|
909
907
|
</text>
|
|
910
908
|
|
|
911
909
|
<!-- Decision: Fini? (Done?) -->
|
|
912
|
-
<line x1="120" y1="
|
|
913
|
-
<polygon points="120,
|
|
914
|
-
<text x="120" y="
|
|
910
|
+
<line x1="120" y1="445" x2="120" y2="460" stroke="#22c55e" stroke-width="2.5"/>
|
|
911
|
+
<polygon points="120,505 155,482 120,460 85,482" fill="transparent" stroke="#22c55e" stroke-width="2"/>
|
|
912
|
+
<text x="120" y="487" text-anchor="middle" fill="#f8fafc" font-size="10" font-weight="500">
|
|
915
913
|
<tspan data-lang="fr">Fini?</tspan>
|
|
916
914
|
<tspan data-lang="en">Done?</tspan>
|
|
917
915
|
</text>
|
|
918
916
|
|
|
919
917
|
<!-- NON path - go right to commit -->
|
|
920
|
-
<line x1="
|
|
921
|
-
<polygon points="195,
|
|
922
|
-
<text x="
|
|
918
|
+
<line x1="155" y1="482" x2="195" y2="482" stroke="#64748b" stroke-width="2.5"/>
|
|
919
|
+
<polygon points="195,482 182,476 182,488" fill="#64748b"/>
|
|
920
|
+
<text x="175" y="472" text-anchor="middle" fill="#64748b" font-size="8" font-weight="600">
|
|
923
921
|
<tspan data-lang="fr">NON</tspan>
|
|
924
922
|
<tspan data-lang="en">NO</tspan>
|
|
925
923
|
</text>
|
|
926
924
|
|
|
927
|
-
<g class="cmd-copyable" data-cmd="/gitflow
|
|
928
|
-
<rect x="198" y="
|
|
929
|
-
<text x="253" y="
|
|
925
|
+
<g class="cmd-copyable" data-cmd="/gitflow commit" style="cursor:pointer;">
|
|
926
|
+
<rect x="198" y="465" width="110" height="34" rx="5" fill="#0f172a" stroke="#8b5cf6" stroke-width="2"/>
|
|
927
|
+
<text x="253" y="487" text-anchor="middle" fill="#8b5cf6" font-size="10" font-family="monospace">/gitflow commit</text>
|
|
930
928
|
</g>
|
|
931
929
|
|
|
932
930
|
<!-- Loop back from commit to coder -->
|
|
933
|
-
<path d="M 253
|
|
934
|
-
<polygon points="160,
|
|
931
|
+
<path d="M 253 465 L 253 420 L 160 420" stroke="#64748b" stroke-width="2.5" fill="none" stroke-dasharray="5,3"/>
|
|
932
|
+
<polygon points="160,420 175,414 175,426" fill="#64748b"/>
|
|
935
933
|
|
|
936
|
-
<!-- OUI path - continue to PR
|
|
937
|
-
<line x1="120" y1="
|
|
938
|
-
<polygon points="120,
|
|
939
|
-
<text x="100" y="
|
|
934
|
+
<!-- OUI path - continue to PR -->
|
|
935
|
+
<line x1="120" y1="505" x2="120" y2="530" stroke="#22c55e" stroke-width="2.5"/>
|
|
936
|
+
<polygon points="120,530 114,516 126,516" fill="#22c55e"/>
|
|
937
|
+
<text x="100" y="520" text-anchor="end" fill="#22c55e" font-size="9" font-weight="600">
|
|
940
938
|
<tspan data-lang="fr">OUI</tspan>
|
|
941
939
|
<tspan data-lang="en">YES</tspan>
|
|
942
940
|
</text>
|
|
943
941
|
|
|
944
942
|
<!-- PR step -->
|
|
945
|
-
<g class="cmd-copyable" data-cmd="/gitflow
|
|
946
|
-
<rect x="30" y="
|
|
947
|
-
<text x="120" y="
|
|
943
|
+
<g class="cmd-copyable" data-cmd="/gitflow pr" style="cursor:pointer;">
|
|
944
|
+
<rect x="30" y="535" width="180" height="28" rx="5" fill="#0f172a" stroke="#06b6d4" stroke-width="2"/>
|
|
945
|
+
<text x="120" y="554" text-anchor="middle" fill="#06b6d4" font-size="9" font-family="monospace">/gitflow pr</text>
|
|
948
946
|
</g>
|
|
949
947
|
|
|
950
948
|
<!-- Arrow to merge on GitHub -->
|
|
951
|
-
<line x1="120" y1="
|
|
952
|
-
<polygon points="120,
|
|
949
|
+
<line x1="120" y1="563" x2="120" y2="575" stroke="#22c55e" stroke-width="2.5"/>
|
|
950
|
+
<polygon points="120,575 114,566 126,566" fill="#22c55e"/>
|
|
953
951
|
|
|
954
952
|
<!-- Merge on GitHub (external step) -->
|
|
955
|
-
<rect x="30" y="
|
|
956
|
-
<text x="120" y="
|
|
953
|
+
<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"/>
|
|
954
|
+
<text x="120" y="594" text-anchor="middle" fill="#94a3b8" font-size="9" font-weight="500">
|
|
957
955
|
<tspan data-lang="fr">Merge sur GitHub</tspan>
|
|
958
956
|
<tspan data-lang="en">Merge on GitHub</tspan>
|
|
959
957
|
</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>
|
|
958
|
+
<text x="120" y="606" text-anchor="middle" fill="#64748b" font-size="7">(manuel ou /gitflow merge)</text>
|
|
964
959
|
|
|
965
960
|
<!-- Arrow to finish -->
|
|
966
|
-
<line x1="120" y1="
|
|
967
|
-
<polygon points="120,
|
|
961
|
+
<line x1="120" y1="612" x2="120" y2="625" stroke="#22c55e" stroke-width="2.5"/>
|
|
962
|
+
<polygon points="120,625 114,616 126,616" fill="#22c55e"/>
|
|
968
963
|
|
|
969
964
|
<!-- Finish step -->
|
|
970
|
-
<g class="cmd-copyable" data-cmd="/gitflow
|
|
971
|
-
<rect x="30" y="
|
|
972
|
-
<text x="120" y="
|
|
965
|
+
<g class="cmd-copyable" data-cmd="/gitflow finish" style="cursor:pointer;">
|
|
966
|
+
<rect x="30" y="630" width="180" height="28" rx="5" fill="#0f172a" stroke="#22c55e" stroke-width="2"/>
|
|
967
|
+
<text x="120" y="649" text-anchor="middle" fill="#22c55e" font-size="9" font-family="monospace">/gitflow finish</text>
|
|
973
968
|
</g>
|
|
974
969
|
|
|
975
970
|
<!-- Arrow to result -->
|
|
976
|
-
<line x1="120" y1="
|
|
977
|
-
<polygon points="120,
|
|
971
|
+
<line x1="120" y1="658" x2="120" y2="672" stroke="#22c55e" stroke-width="2.5"/>
|
|
972
|
+
<polygon points="120,672 114,663 126,663" fill="#22c55e"/>
|
|
978
973
|
|
|
979
974
|
<!-- Final cleanup result -->
|
|
980
|
-
<rect x="30" y="
|
|
981
|
-
<text x="120" y="
|
|
975
|
+
<rect x="30" y="677" width="180" height="45" rx="8" fill="#22c55e" fill-opacity="0.2" stroke="#22c55e" stroke-width="2.5"/>
|
|
976
|
+
<text x="120" y="695" text-anchor="middle" fill="#22c55e" font-size="10" font-weight="600">
|
|
982
977
|
<tspan data-lang="fr">Cleanup</tspan>
|
|
983
978
|
<tspan data-lang="en">Cleanup</tspan>
|
|
984
979
|
</text>
|
|
985
|
-
<text x="120" y="
|
|
980
|
+
<text x="120" y="712" text-anchor="middle" fill="#94a3b8" font-size="8">
|
|
986
981
|
<tspan data-lang="fr">suppression branches + worktree</tspan>
|
|
987
982
|
<tspan data-lang="en">delete branches + worktree</tspan>
|
|
988
983
|
</text>
|
|
@@ -1003,9 +998,9 @@
|
|
|
1003
998
|
<line x1="400" y1="310" x2="400" y2="335" stroke="#eab308" stroke-width="2.5"/>
|
|
1004
999
|
<polygon points="400,335 394,321 406,321" fill="#eab308"/>
|
|
1005
1000
|
|
|
1006
|
-
<g class="cmd-copyable" data-cmd="/gitflow
|
|
1001
|
+
<g class="cmd-copyable" data-cmd="/gitflow start release" style="cursor:pointer;">
|
|
1007
1002
|
<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
|
|
1003
|
+
<text x="400" y="365" text-anchor="middle" fill="#eab308" font-size="11" font-family="monospace">/gitflow start release</text>
|
|
1009
1004
|
</g>
|
|
1010
1005
|
|
|
1011
1006
|
<!-- Release: tests... -->
|
|
@@ -1031,9 +1026,9 @@
|
|
|
1031
1026
|
</text>
|
|
1032
1027
|
|
|
1033
1028
|
<!-- Shared commit box between Release and Hotfix -->
|
|
1034
|
-
<g class="cmd-copyable" data-cmd="/gitflow
|
|
1029
|
+
<g class="cmd-copyable" data-cmd="/gitflow commit" style="cursor:pointer;">
|
|
1035
1030
|
<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
|
|
1031
|
+
<text x="558" y="487" text-anchor="middle" fill="#8b5cf6" font-size="10" font-family="monospace">/gitflow commit</text>
|
|
1037
1032
|
</g>
|
|
1038
1033
|
|
|
1039
1034
|
<!-- Hotfix NON -> commit (shared) -->
|
|
@@ -1060,9 +1055,9 @@
|
|
|
1060
1055
|
</text>
|
|
1061
1056
|
|
|
1062
1057
|
<!-- Release: PR step -->
|
|
1063
|
-
<g class="cmd-copyable" data-cmd="/gitflow
|
|
1058
|
+
<g class="cmd-copyable" data-cmd="/gitflow pr" style="cursor:pointer;">
|
|
1064
1059
|
<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
|
|
1060
|
+
<text x="400" y="554" text-anchor="middle" fill="#06b6d4" font-size="9" font-family="monospace">/gitflow pr</text>
|
|
1066
1061
|
</g>
|
|
1067
1062
|
|
|
1068
1063
|
<line x1="400" y1="563" x2="400" y2="575" stroke="#eab308" stroke-width="2.5"/>
|
|
@@ -1074,14 +1069,14 @@
|
|
|
1074
1069
|
<tspan data-lang="fr">Merge sur GitHub</tspan>
|
|
1075
1070
|
<tspan data-lang="en">Merge on GitHub</tspan>
|
|
1076
1071
|
</text>
|
|
1077
|
-
<text x="400" y="606" text-anchor="middle" fill="#64748b" font-size="7">(manuel ou /gitflow
|
|
1072
|
+
<text x="400" y="606" text-anchor="middle" fill="#64748b" font-size="7">(manuel ou /gitflow merge)</text>
|
|
1078
1073
|
|
|
1079
1074
|
<line x1="400" y1="612" x2="400" y2="625" stroke="#eab308" stroke-width="2.5"/>
|
|
1080
1075
|
<polygon points="400,625 394,616 406,616" fill="#eab308"/>
|
|
1081
1076
|
|
|
1082
|
-
<g class="cmd-copyable" data-cmd="/gitflow
|
|
1077
|
+
<g class="cmd-copyable" data-cmd="/gitflow finish" style="cursor:pointer;">
|
|
1083
1078
|
<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
|
|
1079
|
+
<text x="400" y="649" text-anchor="middle" fill="#eab308" font-size="9" font-family="monospace">/gitflow finish</text>
|
|
1085
1080
|
</g>
|
|
1086
1081
|
|
|
1087
1082
|
<line x1="400" y1="658" x2="400" y2="672" stroke="#eab308" stroke-width="2.5"/>
|
|
@@ -1113,9 +1108,9 @@
|
|
|
1113
1108
|
<line x1="720" y1="310" x2="720" y2="335" stroke="#ec4899" stroke-width="2.5"/>
|
|
1114
1109
|
<polygon points="720,335 714,321 726,321" fill="#ec4899"/>
|
|
1115
1110
|
|
|
1116
|
-
<g class="cmd-copyable" data-cmd="/gitflow
|
|
1111
|
+
<g class="cmd-copyable" data-cmd="/gitflow start hotfix {nom}" style="cursor:pointer;">
|
|
1117
1112
|
<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
|
|
1113
|
+
<text x="720" y="365" text-anchor="middle" fill="#ec4899" font-size="11" font-family="monospace">/gitflow start hotfix</text>
|
|
1119
1114
|
</g>
|
|
1120
1115
|
|
|
1121
1116
|
<!-- Hotfix: fix... -->
|
|
@@ -1142,9 +1137,9 @@
|
|
|
1142
1137
|
</text>
|
|
1143
1138
|
|
|
1144
1139
|
<!-- Hotfix: PR step -->
|
|
1145
|
-
<g class="cmd-copyable" data-cmd="/gitflow
|
|
1140
|
+
<g class="cmd-copyable" data-cmd="/gitflow pr" style="cursor:pointer;">
|
|
1146
1141
|
<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
|
|
1142
|
+
<text x="720" y="554" text-anchor="middle" fill="#06b6d4" font-size="9" font-family="monospace">/gitflow pr</text>
|
|
1148
1143
|
</g>
|
|
1149
1144
|
|
|
1150
1145
|
<line x1="720" y1="563" x2="720" y2="575" stroke="#ec4899" stroke-width="2.5"/>
|
|
@@ -1156,14 +1151,14 @@
|
|
|
1156
1151
|
<tspan data-lang="fr">Merge sur GitHub</tspan>
|
|
1157
1152
|
<tspan data-lang="en">Merge on GitHub</tspan>
|
|
1158
1153
|
</text>
|
|
1159
|
-
<text x="720" y="606" text-anchor="middle" fill="#64748b" font-size="7">(manuel ou /gitflow
|
|
1154
|
+
<text x="720" y="606" text-anchor="middle" fill="#64748b" font-size="7">(manuel ou /gitflow merge)</text>
|
|
1160
1155
|
|
|
1161
1156
|
<line x1="720" y1="612" x2="720" y2="625" stroke="#ec4899" stroke-width="2.5"/>
|
|
1162
1157
|
<polygon points="720,625 714,616 726,616" fill="#ec4899"/>
|
|
1163
1158
|
|
|
1164
|
-
<g class="cmd-copyable" data-cmd="/gitflow
|
|
1159
|
+
<g class="cmd-copyable" data-cmd="/gitflow finish" style="cursor:pointer;">
|
|
1165
1160
|
<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
|
|
1161
|
+
<text x="720" y="649" text-anchor="middle" fill="#ec4899" font-size="9" font-family="monospace">/gitflow finish</text>
|
|
1167
1162
|
</g>
|
|
1168
1163
|
|
|
1169
1164
|
<!-- Hotfix result -->
|
|
@@ -1191,27 +1186,27 @@
|
|
|
1191
1186
|
</text>
|
|
1192
1187
|
|
|
1193
1188
|
<!-- Init (first - setup) -->
|
|
1194
|
-
<g class="cmd-copyable" data-cmd="/gitflow
|
|
1189
|
+
<g class="cmd-copyable" data-cmd="/gitflow init" style="cursor:pointer;">
|
|
1195
1190
|
<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
|
|
1191
|
+
<text x="1055" y="141" text-anchor="middle" fill="#64748b" font-size="11" font-family="monospace">/gitflow init</text>
|
|
1197
1192
|
</g>
|
|
1198
1193
|
|
|
1199
1194
|
<!-- Status -->
|
|
1200
|
-
<g class="cmd-copyable" data-cmd="/gitflow
|
|
1195
|
+
<g class="cmd-copyable" data-cmd="/gitflow status" style="cursor:pointer;">
|
|
1201
1196
|
<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
|
|
1197
|
+
<text x="1055" y="187" text-anchor="middle" fill="#3b82f6" font-size="11" font-family="monospace">/gitflow status</text>
|
|
1203
1198
|
</g>
|
|
1204
1199
|
|
|
1205
1200
|
<!-- Commit -->
|
|
1206
|
-
<g class="cmd-copyable" data-cmd="/gitflow
|
|
1201
|
+
<g class="cmd-copyable" data-cmd="/gitflow commit" style="cursor:pointer;">
|
|
1207
1202
|
<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
|
|
1203
|
+
<text x="1055" y="233" text-anchor="middle" fill="#8b5cf6" font-size="11" font-family="monospace">/gitflow commit</text>
|
|
1209
1204
|
</g>
|
|
1210
1205
|
|
|
1211
1206
|
<!-- Abort -->
|
|
1212
|
-
<g class="cmd-copyable" data-cmd="/gitflow
|
|
1207
|
+
<g class="cmd-copyable" data-cmd="/gitflow abort" style="cursor:pointer;">
|
|
1213
1208
|
<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
|
|
1209
|
+
<text x="1055" y="279" text-anchor="middle" fill="#ef4444" font-size="11" font-family="monospace">/gitflow abort</text>
|
|
1215
1210
|
</g>
|
|
1216
1211
|
|
|
1217
1212
|
<!-- PR Commands Section -->
|
|
@@ -1221,21 +1216,21 @@
|
|
|
1221
1216
|
</text>
|
|
1222
1217
|
|
|
1223
1218
|
<!-- Pull Request -->
|
|
1224
|
-
<g class="cmd-copyable" data-cmd="/gitflow
|
|
1219
|
+
<g class="cmd-copyable" data-cmd="/gitflow pr" style="cursor:pointer;">
|
|
1225
1220
|
<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
|
|
1221
|
+
<text x="1055" y="355" text-anchor="middle" fill="#06b6d4" font-size="11" font-family="monospace">/gitflow pr</text>
|
|
1227
1222
|
</g>
|
|
1228
1223
|
|
|
1229
1224
|
<!-- Review -->
|
|
1230
|
-
<g class="cmd-copyable" data-cmd="/gitflow
|
|
1225
|
+
<g class="cmd-copyable" data-cmd="/gitflow merge" style="cursor:pointer;">
|
|
1231
1226
|
<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
|
|
1227
|
+
<text x="1055" y="401" text-anchor="middle" fill="#10b981" font-size="11" font-family="monospace">/gitflow merge</text>
|
|
1233
1228
|
</g>
|
|
1234
1229
|
|
|
1235
1230
|
<!-- Merge -->
|
|
1236
|
-
<g class="cmd-copyable" data-cmd="/gitflow
|
|
1231
|
+
<g class="cmd-copyable" data-cmd="/gitflow merge" style="cursor:pointer;">
|
|
1237
1232
|
<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
|
|
1233
|
+
<text x="1055" y="447" text-anchor="middle" fill="#6366f1" font-size="11" font-family="monospace">/gitflow merge</text>
|
|
1239
1234
|
</g>
|
|
1240
1235
|
|
|
1241
1236
|
<!-- Cleanup Commands Section -->
|
|
@@ -1245,15 +1240,15 @@
|
|
|
1245
1240
|
</text>
|
|
1246
1241
|
|
|
1247
1242
|
<!-- Finish -->
|
|
1248
|
-
<g class="cmd-copyable" data-cmd="/gitflow
|
|
1243
|
+
<g class="cmd-copyable" data-cmd="/gitflow finish" style="cursor:pointer;">
|
|
1249
1244
|
<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
|
|
1245
|
+
<text x="1055" y="524" text-anchor="middle" fill="#22c55e" font-size="11" font-family="monospace">/gitflow finish</text>
|
|
1251
1246
|
</g>
|
|
1252
1247
|
|
|
1253
1248
|
<!-- Cleanup -->
|
|
1254
|
-
<g class="cmd-copyable" data-cmd="/gitflow
|
|
1249
|
+
<g class="cmd-copyable" data-cmd="/gitflow cleanup" style="cursor:pointer;">
|
|
1255
1250
|
<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
|
|
1251
|
+
<text x="1055" y="570" text-anchor="middle" fill="#f97316" font-size="11" font-family="monospace">/gitflow cleanup</text>
|
|
1257
1252
|
</g>
|
|
1258
1253
|
|
|
1259
1254
|
<!-- Legend inside box -->
|
|
@@ -1303,7 +1298,7 @@
|
|
|
1303
1298
|
<!-- Start -->
|
|
1304
1299
|
<g transform="translate(120, 80)">
|
|
1305
1300
|
<rect x="0" y="0" width="180" height="50" rx="8" fill="transparent" stroke="#22c55e" stroke-width="2"/>
|
|
1306
|
-
<text x="90" y="22" text-anchor="middle" fill="#4ade80" font-size="12" font-weight="600">/gitflow
|
|
1301
|
+
<text x="90" y="22" text-anchor="middle" fill="#4ade80" font-size="12" font-weight="600">/gitflow start</text>
|
|
1307
1302
|
<text x="90" y="40" text-anchor="middle" fill="#64748b" font-size="10">
|
|
1308
1303
|
<tspan data-lang="fr">Demarrer branche</tspan>
|
|
1309
1304
|
<tspan data-lang="en">Start branch</tspan>
|
|
@@ -1317,7 +1312,7 @@
|
|
|
1317
1312
|
<!-- Commit (loop) -->
|
|
1318
1313
|
<g transform="translate(390, 80)">
|
|
1319
1314
|
<rect x="0" y="0" width="180" height="50" rx="8" fill="transparent" stroke="#8b5cf6" stroke-width="2"/>
|
|
1320
|
-
<text x="90" y="22" text-anchor="middle" fill="#a78bfa" font-size="12" font-weight="600">/gitflow
|
|
1315
|
+
<text x="90" y="22" text-anchor="middle" fill="#a78bfa" font-size="12" font-weight="600">/gitflow commit</text>
|
|
1321
1316
|
<text x="90" y="40" text-anchor="middle" fill="#64748b" font-size="10">
|
|
1322
1317
|
<tspan data-lang="fr">Commiter (boucle)</tspan>
|
|
1323
1318
|
<tspan data-lang="en">Commit (loop)</tspan>
|
|
@@ -1364,7 +1359,7 @@
|
|
|
1364
1359
|
<!-- PR -->
|
|
1365
1360
|
<g transform="translate(15, 35)">
|
|
1366
1361
|
<rect x="0" y="0" width="85" height="45" rx="5" fill="transparent" stroke="#06b6d4" stroke-width="2"/>
|
|
1367
|
-
<text x="42" y="20" text-anchor="middle" fill="#22d3ee" font-size="8" font-weight="600">/gitflow
|
|
1362
|
+
<text x="42" y="20" text-anchor="middle" fill="#22d3ee" font-size="8" font-weight="600">/gitflow pr</text>
|
|
1368
1363
|
<text x="42" y="35" text-anchor="middle" fill="#64748b" font-size="7">Creer PR</text>
|
|
1369
1364
|
</g>
|
|
1370
1365
|
|
|
@@ -1386,7 +1381,7 @@
|
|
|
1386
1381
|
<!-- Finish -->
|
|
1387
1382
|
<g transform="translate(225, 35)">
|
|
1388
1383
|
<rect x="0" y="0" width="85" height="45" rx="5" fill="transparent" stroke="#22c55e" stroke-width="2"/>
|
|
1389
|
-
<text x="42" y="20" text-anchor="middle" fill="#4ade80" font-size="8" font-weight="600">/gitflow
|
|
1384
|
+
<text x="42" y="20" text-anchor="middle" fill="#4ade80" font-size="8" font-weight="600">/gitflow finish</text>
|
|
1390
1385
|
<text x="42" y="35" text-anchor="middle" fill="#64748b" font-size="7">tag + cleanup</text>
|
|
1391
1386
|
</g>
|
|
1392
1387
|
|
|
@@ -1419,7 +1414,7 @@
|
|
|
1419
1414
|
<!-- Plan -->
|
|
1420
1415
|
<g transform="translate(60, 35)">
|
|
1421
1416
|
<rect x="0" y="0" width="100" height="45" rx="5" fill="transparent" stroke="#f97316" stroke-width="2"/>
|
|
1422
|
-
<text x="50" y="20" text-anchor="middle" fill="#fb923c" font-size="8" font-weight="600">/gitflow
|
|
1417
|
+
<text x="50" y="20" text-anchor="middle" fill="#fb923c" font-size="8" font-weight="600">/gitflow plan</text>
|
|
1423
1418
|
<text x="50" y="35" text-anchor="middle" fill="#64748b" font-size="7">Analyse conflits</text>
|
|
1424
1419
|
</g>
|
|
1425
1420
|
|
|
@@ -1430,7 +1425,7 @@
|
|
|
1430
1425
|
<!-- Exec -->
|
|
1431
1426
|
<g transform="translate(185, 35)">
|
|
1432
1427
|
<rect x="0" y="0" width="100" height="45" rx="5" fill="transparent" stroke="#f97316" stroke-width="2"/>
|
|
1433
|
-
<text x="50" y="20" text-anchor="middle" fill="#fb923c" font-size="8" font-weight="600">/gitflow
|
|
1428
|
+
<text x="50" y="20" text-anchor="middle" fill="#fb923c" font-size="8" font-weight="600">/gitflow merge</text>
|
|
1434
1429
|
<text x="50" y="35" text-anchor="middle" fill="#64748b" font-size="7">Merge local</text>
|
|
1435
1430
|
</g>
|
|
1436
1431
|
|
|
@@ -1456,27 +1451,27 @@
|
|
|
1456
1451
|
|
|
1457
1452
|
<g transform="translate(80, 310)">
|
|
1458
1453
|
<rect x="0" y="0" width="120" height="35" rx="5" fill="transparent" stroke="#475569" stroke-width="1.5" stroke-dasharray="3,2"/>
|
|
1459
|
-
<text x="60" y="22" text-anchor="middle" fill="#64748b" font-size="10">/gitflow
|
|
1454
|
+
<text x="60" y="22" text-anchor="middle" fill="#64748b" font-size="10">/gitflow init</text>
|
|
1460
1455
|
</g>
|
|
1461
1456
|
|
|
1462
1457
|
<g transform="translate(220, 310)">
|
|
1463
1458
|
<rect x="0" y="0" width="130" height="35" rx="5" fill="transparent" stroke="#3b82f6" stroke-width="1.5"/>
|
|
1464
|
-
<text x="65" y="22" text-anchor="middle" fill="#60a5fa" font-size="10">/gitflow
|
|
1459
|
+
<text x="65" y="22" text-anchor="middle" fill="#60a5fa" font-size="10">/gitflow status</text>
|
|
1465
1460
|
</g>
|
|
1466
1461
|
|
|
1467
1462
|
<g transform="translate(370, 310)">
|
|
1468
1463
|
<rect x="0" y="0" width="120" height="35" rx="5" fill="transparent" stroke="#ef4444" stroke-width="1.5"/>
|
|
1469
|
-
<text x="60" y="22" text-anchor="middle" fill="#f87171" font-size="10">/gitflow
|
|
1464
|
+
<text x="60" y="22" text-anchor="middle" fill="#f87171" font-size="10">/gitflow abort</text>
|
|
1470
1465
|
</g>
|
|
1471
1466
|
|
|
1472
1467
|
<g transform="translate(510, 310)">
|
|
1473
1468
|
<rect x="0" y="0" width="140" height="35" rx="5" fill="transparent" stroke="#f97316" stroke-width="1.5"/>
|
|
1474
|
-
<text x="70" y="22" text-anchor="middle" fill="#fb923c" font-size="10">/gitflow
|
|
1469
|
+
<text x="70" y="22" text-anchor="middle" fill="#fb923c" font-size="10">/gitflow cleanup</text>
|
|
1475
1470
|
</g>
|
|
1476
1471
|
|
|
1477
1472
|
<g transform="translate(670, 310)">
|
|
1478
1473
|
<rect x="0" y="0" width="140" height="35" rx="5" fill="transparent" stroke="#22c55e" stroke-width="1.5"/>
|
|
1479
|
-
<text x="70" y="22" text-anchor="middle" fill="#4ade80" font-size="10">/gitflow
|
|
1474
|
+
<text x="70" y="22" text-anchor="middle" fill="#4ade80" font-size="10">/gitflow finish</text>
|
|
1480
1475
|
</g>
|
|
1481
1476
|
|
|
1482
1477
|
<!-- Legend -->
|
|
@@ -1513,7 +1508,7 @@
|
|
|
1513
1508
|
<!-- gitflow:1-init -->
|
|
1514
1509
|
<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
1510
|
<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
|
|
1511
|
+
<code style="background: #475569; color: #f8fafc; padding: 0.25rem 0.5rem; border-radius: 4px; font-size: 0.85rem;">/gitflow init</code>
|
|
1517
1512
|
</div>
|
|
1518
1513
|
<h5 style="color: #c8d0dc; margin: 0 0 0.5rem 0; font-size: 0.95rem;">
|
|
1519
1514
|
<span data-lang="fr">Initialisation</span>
|
|
@@ -1528,7 +1523,7 @@
|
|
|
1528
1523
|
<!-- gitflow:2-status -->
|
|
1529
1524
|
<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
1525
|
<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
|
|
1526
|
+
<code style="background: #3b82f6; color: #f8fafc; padding: 0.25rem 0.5rem; border-radius: 4px; font-size: 0.85rem;">/gitflow status</code>
|
|
1532
1527
|
</div>
|
|
1533
1528
|
<h5 style="color: #c8d0dc; margin: 0 0 0.5rem 0; font-size: 0.95rem;">
|
|
1534
1529
|
<span data-lang="fr">Etat du projet</span>
|
|
@@ -1543,7 +1538,7 @@
|
|
|
1543
1538
|
<!-- gitflow:3-commit -->
|
|
1544
1539
|
<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
1540
|
<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
|
|
1541
|
+
<code style="background: #8b5cf6; color: #f8fafc; padding: 0.25rem 0.5rem; border-radius: 4px; font-size: 0.85rem;">/gitflow commit</code>
|
|
1547
1542
|
</div>
|
|
1548
1543
|
<h5 style="color: #c8d0dc; margin: 0 0 0.5rem 0; font-size: 0.95rem;">
|
|
1549
1544
|
<span data-lang="fr">Commit intelligent</span>
|
|
@@ -1558,22 +1553,22 @@
|
|
|
1558
1553
|
<!-- gitflow:4-plan -->
|
|
1559
1554
|
<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
1555
|
<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
|
|
1556
|
+
<code style="background: #f97316; color: #f8fafc; padding: 0.25rem 0.5rem; border-radius: 4px; font-size: 0.85rem;">/gitflow plan</code>
|
|
1562
1557
|
</div>
|
|
1563
1558
|
<h5 style="color: #c8d0dc; margin: 0 0 0.5rem 0; font-size: 0.95rem;">
|
|
1564
1559
|
<span data-lang="fr">Planifier l'integration</span>
|
|
1565
1560
|
<span data-lang="en">Plan Integration</span>
|
|
1566
1561
|
</h5>
|
|
1567
1562
|
<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
|
|
1563
|
+
<span data-lang="fr">Analyse les conflits potentiels avec develop. Cree un plan detaille de merge. A executer avant /gitflow merge.</span>
|
|
1564
|
+
<span data-lang="en">Analyzes potential conflicts with develop. Creates detailed merge plan. Run before /gitflow merge.</span>
|
|
1570
1565
|
</p>
|
|
1571
1566
|
</div>
|
|
1572
1567
|
|
|
1573
1568
|
<!-- gitflow:5-exec -->
|
|
1574
1569
|
<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
1570
|
<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
|
|
1571
|
+
<code style="background: #f97316; color: #f8fafc; padding: 0.25rem 0.5rem; border-radius: 4px; font-size: 0.85rem;">/gitflow merge</code>
|
|
1577
1572
|
</div>
|
|
1578
1573
|
<h5 style="color: #c8d0dc; margin: 0 0 0.5rem 0; font-size: 0.95rem;">
|
|
1579
1574
|
<span data-lang="fr">Executer le merge</span>
|
|
@@ -1588,7 +1583,7 @@
|
|
|
1588
1583
|
<!-- gitflow:6-abort -->
|
|
1589
1584
|
<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
1585
|
<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
|
|
1586
|
+
<code style="background: #ef4444; color: #f8fafc; padding: 0.25rem 0.5rem; border-radius: 4px; font-size: 0.85rem;">/gitflow abort</code>
|
|
1592
1587
|
</div>
|
|
1593
1588
|
<h5 style="color: #c8d0dc; margin: 0 0 0.5rem 0; font-size: 0.95rem;">
|
|
1594
1589
|
<span data-lang="fr">Annuler l'operation</span>
|
|
@@ -1603,7 +1598,7 @@
|
|
|
1603
1598
|
<!-- gitflow:7-pull-request -->
|
|
1604
1599
|
<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
1600
|
<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
|
|
1601
|
+
<code style="background: #06b6d4; color: #0f172a; padding: 0.25rem 0.5rem; border-radius: 4px; font-size: 0.85rem;">/gitflow pr</code>
|
|
1607
1602
|
</div>
|
|
1608
1603
|
<h5 style="color: #c8d0dc; margin: 0 0 0.5rem 0; font-size: 0.95rem;">
|
|
1609
1604
|
<span data-lang="fr">Creer une Pull Request</span>
|
|
@@ -1618,7 +1613,7 @@
|
|
|
1618
1613
|
<!-- gitflow:8-review -->
|
|
1619
1614
|
<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
1615
|
<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
|
|
1616
|
+
<code style="background: #10b981; color: #0f172a; padding: 0.25rem 0.5rem; border-radius: 4px; font-size: 0.85rem;">/gitflow merge</code>
|
|
1622
1617
|
</div>
|
|
1623
1618
|
<h5 style="color: #c8d0dc; margin: 0 0 0.5rem 0; font-size: 0.95rem;">
|
|
1624
1619
|
<span data-lang="fr">Review de Pull Request</span>
|
|
@@ -1633,7 +1628,7 @@
|
|
|
1633
1628
|
<!-- gitflow:9-merge -->
|
|
1634
1629
|
<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
1630
|
<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
|
|
1631
|
+
<code style="background: #6366f1; color: #f8fafc; padding: 0.25rem 0.5rem; border-radius: 4px; font-size: 0.85rem;">/gitflow merge</code>
|
|
1637
1632
|
</div>
|
|
1638
1633
|
<h5 style="color: #c8d0dc; margin: 0 0 0.5rem 0; font-size: 0.95rem;">
|
|
1639
1634
|
<span data-lang="fr">Merger la Pull Request</span>
|
|
@@ -1648,7 +1643,7 @@
|
|
|
1648
1643
|
<!-- gitflow:10-start -->
|
|
1649
1644
|
<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
1645
|
<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
|
|
1646
|
+
<code style="background: #22c55e; color: #0f172a; padding: 0.25rem 0.5rem; border-radius: 4px; font-size: 0.85rem;">/gitflow start</code>
|
|
1652
1647
|
</div>
|
|
1653
1648
|
<h5 style="color: #c8d0dc; margin: 0 0 0.5rem 0; font-size: 0.95rem;">
|
|
1654
1649
|
<span data-lang="fr">Demarrer une branche</span>
|
|
@@ -1668,7 +1663,7 @@
|
|
|
1668
1663
|
<!-- gitflow:11-finish -->
|
|
1669
1664
|
<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
1665
|
<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
|
|
1666
|
+
<code style="background: #eab308; color: #0f172a; padding: 0.25rem 0.5rem; border-radius: 4px; font-size: 0.85rem;">/gitflow finish</code>
|
|
1672
1667
|
</div>
|
|
1673
1668
|
<h5 style="color: #c8d0dc; margin: 0 0 0.5rem 0; font-size: 0.95rem;">
|
|
1674
1669
|
<span data-lang="fr">Finaliser release/hotfix</span>
|
|
@@ -1683,7 +1678,7 @@
|
|
|
1683
1678
|
<!-- gitflow:12-cleanup -->
|
|
1684
1679
|
<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
1680
|
<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
|
|
1681
|
+
<code style="background: #64748b; color: #f8fafc; padding: 0.25rem 0.5rem; border-radius: 4px; font-size: 0.85rem;">/gitflow cleanup</code>
|
|
1687
1682
|
<span style="background: #1e293b; color: #94a3b8; padding: 0.15rem 0.4rem; border-radius: 3px; font-size: 0.7rem;">MAINTENANCE</span>
|
|
1688
1683
|
</div>
|
|
1689
1684
|
<h5 style="color: #c8d0dc; margin: 0 0 0.5rem 0; font-size: 0.95rem;">
|
|
@@ -1699,7 +1694,7 @@
|
|
|
1699
1694
|
<!-- gitflow:13-sync -->
|
|
1700
1695
|
<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
1696
|
<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
|
|
1697
|
+
<code style="background: #14b8a6; color: #0f172a; padding: 0.25rem 0.5rem; border-radius: 4px; font-size: 0.85rem;">/gitflow sync</code>
|
|
1703
1698
|
</div>
|
|
1704
1699
|
<h5 style="color: #c8d0dc; margin: 0 0 0.5rem 0; font-size: 0.95rem;">
|
|
1705
1700
|
<span data-lang="fr">Synchroniser avec le remote</span>
|
|
@@ -1714,7 +1709,7 @@
|
|
|
1714
1709
|
<!-- gitflow:14-rebase -->
|
|
1715
1710
|
<div class="command-card" style="background: var(--bg-card); border: 1px solid var(--border); border-radius: 8px; padding: 1.25rem; border-left: 4px solid #a855f7;">
|
|
1716
1711
|
<div style="display: flex; align-items: center; gap: 0.5rem; margin-bottom: 0.75rem;">
|
|
1717
|
-
<code style="background: #a855f7; color: #f8fafc; padding: 0.25rem 0.5rem; border-radius: 4px; font-size: 0.85rem;">/gitflow
|
|
1712
|
+
<code style="background: #a855f7; color: #f8fafc; padding: 0.25rem 0.5rem; border-radius: 4px; font-size: 0.85rem;">/gitflow sync</code>
|
|
1718
1713
|
</div>
|
|
1719
1714
|
<h5 style="color: #c8d0dc; margin: 0 0 0.5rem 0; font-size: 0.95rem;">
|
|
1720
1715
|
<span data-lang="fr">Rebase sur branche cible</span>
|
|
@@ -1725,8 +1720,8 @@
|
|
|
1725
1720
|
<span data-lang="en">Rebases current branch on develop (or specified branch):</span>
|
|
1726
1721
|
</p>
|
|
1727
1722
|
<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
|
|
1729
|
-
<li><code style="color: #a855f7;">/gitflow
|
|
1723
|
+
<li><code style="color: #a855f7;">/gitflow sync</code> <span data-lang="fr">→ rebase sur develop</span><span data-lang="en">→ rebase on develop</span></li>
|
|
1724
|
+
<li><code style="color: #a855f7;">/gitflow sync main</code> <span data-lang="fr">→ rebase sur main</span><span data-lang="en">→ rebase on main</span></li>
|
|
1730
1725
|
</ul>
|
|
1731
1726
|
</div>
|
|
1732
1727
|
</div>
|
|
@@ -2021,8 +2016,8 @@
|
|
|
2021
2016
|
<tr>
|
|
2022
2017
|
<td><a href=".claude/gitflow/plans/" class="file-link"><code>.claude/gitflow/plans/</code></a></td>
|
|
2023
2018
|
<td>
|
|
2024
|
-
<span data-lang="fr">Plans d'integration generes par /gitflow
|
|
2025
|
-
<span data-lang="en">Integration plans generated by /gitflow
|
|
2019
|
+
<span data-lang="fr">Plans d'integration generes par /gitflow plan</span>
|
|
2020
|
+
<span data-lang="en">Integration plans generated by /gitflow plan</span>
|
|
2026
2021
|
</td>
|
|
2027
2022
|
</tr>
|
|
2028
2023
|
<tr>
|
|
@@ -2047,23 +2042,23 @@
|
|
|
2047
2042
|
<h3 data-lang="en">Automatic Creation</h3>
|
|
2048
2043
|
|
|
2049
2044
|
<p data-lang="fr">
|
|
2050
|
-
La structure est creee automatiquement par <code>/gitflow
|
|
2045
|
+
La structure est creee automatiquement par <code>/gitflow init</code>. Les worktrees sont crees lors du premier <code>/gitflow start</code>.
|
|
2051
2046
|
</p>
|
|
2052
2047
|
<p data-lang="en">
|
|
2053
|
-
The structure is automatically created by <code>/gitflow
|
|
2048
|
+
The structure is automatically created by <code>/gitflow init</code>. Worktrees are created on the first <code>/gitflow start</code>.
|
|
2054
2049
|
</p>
|
|
2055
2050
|
|
|
2056
2051
|
<div class="code-block">
|
|
2057
2052
|
<button class="copy-btn">Copy</button>
|
|
2058
2053
|
<pre><code><span class="code-comment"># Initialiser GitFlow avec worktrees</span>
|
|
2059
|
-
<span class="code-cmd">/gitflow
|
|
2054
|
+
<span class="code-cmd">/gitflow init</span> <span class="code-flag">--with-worktrees</span>
|
|
2060
2055
|
|
|
2061
2056
|
<span class="code-comment"># Demarrer une feature (cree le worktree automatiquement)</span>
|
|
2062
|
-
<span class="code-cmd">/gitflow
|
|
2057
|
+
<span class="code-cmd">/gitflow start</span> <span class="code-arg">feature</span> <span class="code-string">user-auth</span>
|
|
2063
2058
|
<span class="code-output"># → Worktree cree: ../worktrees/features/user-auth/</span>
|
|
2064
2059
|
|
|
2065
2060
|
<span class="code-comment"># Travailler sans worktree (meme repertoire)</span>
|
|
2066
|
-
<span class="code-cmd">/gitflow
|
|
2061
|
+
<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
2062
|
</div>
|
|
2068
2063
|
</section>
|
|
2069
2064
|
|
|
@@ -2104,10 +2099,10 @@ release/new</code></pre>
|
|
|
2104
2099
|
<span data-lang="en">Atomic Commits</span>
|
|
2105
2100
|
</h4>
|
|
2106
2101
|
<p data-lang="fr">
|
|
2107
|
-
Chaque commit doit representer un changement logique unique. Utilisez <code>/gitflow
|
|
2102
|
+
Chaque commit doit representer un changement logique unique. Utilisez <code>/gitflow commit</code> pour des commits structures.
|
|
2108
2103
|
</p>
|
|
2109
2104
|
<p data-lang="en">
|
|
2110
|
-
Each commit should represent a single logical change. Use <code>/gitflow
|
|
2105
|
+
Each commit should represent a single logical change. Use <code>/gitflow commit</code> for structured commits.
|
|
2111
2106
|
</p>
|
|
2112
2107
|
<div class="code-block">
|
|
2113
2108
|
<pre><code># Bon - Commits atomiques
|
|
@@ -2133,7 +2128,7 @@ WIP: auth stuff</code></pre>
|
|
|
2133
2128
|
Before merging a feature, rebase on develop to have a clean history and avoid merge conflicts.
|
|
2134
2129
|
</p>
|
|
2135
2130
|
<div class="code-block">
|
|
2136
|
-
<pre><code># Claude Tools le fait automatiquement avec /gitflow
|
|
2131
|
+
<pre><code># Claude Tools le fait automatiquement avec /gitflow merge
|
|
2137
2132
|
# Manuellement :
|
|
2138
2133
|
git checkout feature/my-feature
|
|
2139
2134
|
git fetch origin
|
|
@@ -2165,20 +2160,20 @@ git merge --no-ff feature/my-feature</code></pre>
|
|
|
2165
2160
|
<span data-lang="en">Regularly Clean Up Worktrees</span>
|
|
2166
2161
|
</h4>
|
|
2167
2162
|
<p data-lang="fr">
|
|
2168
|
-
Apres chaque release ou hotfix, les worktrees sont nettoyes automatiquement. Pour un audit complet, utilisez <code>/gitflow
|
|
2163
|
+
Apres chaque release ou hotfix, les worktrees sont nettoyes automatiquement. Pour un audit complet, utilisez <code>/gitflow cleanup</code> depuis main ou develop.
|
|
2169
2164
|
</p>
|
|
2170
2165
|
<p data-lang="en">
|
|
2171
|
-
After each release or hotfix, worktrees are automatically cleaned up. For a full audit, use <code>/gitflow
|
|
2166
|
+
After each release or hotfix, worktrees are automatically cleaned up. For a full audit, use <code>/gitflow cleanup</code> from main or develop.
|
|
2172
2167
|
</p>
|
|
2173
2168
|
<div class="code-block">
|
|
2174
2169
|
<pre><code># Audit et nettoyage complet (depuis main ou develop)
|
|
2175
|
-
/gitflow
|
|
2170
|
+
/gitflow cleanup
|
|
2176
2171
|
|
|
2177
2172
|
# Audit seul sans suppression
|
|
2178
|
-
/gitflow
|
|
2173
|
+
/gitflow cleanup --dry-run
|
|
2179
2174
|
|
|
2180
2175
|
# Nettoyage automatique des orphelins
|
|
2181
|
-
/gitflow
|
|
2176
|
+
/gitflow cleanup --force</code></pre>
|
|
2182
2177
|
</div>
|
|
2183
2178
|
</div>
|
|
2184
2179
|
|
|
@@ -2189,10 +2184,10 @@ git merge --no-ff feature/my-feature</code></pre>
|
|
|
2189
2184
|
<span data-lang="en">Test Before Merging</span>
|
|
2190
2185
|
</h4>
|
|
2191
2186
|
<p data-lang="fr">
|
|
2192
|
-
<code>/gitflow
|
|
2187
|
+
<code>/gitflow merge</code> execute automatiquement les tests, le build et le lint avant tout merge.
|
|
2193
2188
|
</p>
|
|
2194
2189
|
<p data-lang="en">
|
|
2195
|
-
<code>/gitflow
|
|
2190
|
+
<code>/gitflow merge</code> automatically runs tests, build and lint before any merge.
|
|
2196
2191
|
</p>
|
|
2197
2192
|
</div>
|
|
2198
2193
|
|
|
@@ -2237,10 +2232,10 @@ git merge --no-ff feature/my-feature</code></pre>
|
|
|
2237
2232
|
<p data-lang="fr">Claude Tools fournit 12 commandes pour gerer le workflow GitFlow. Chaque commande inclut son prompt complet.</p>
|
|
2238
2233
|
<p data-lang="en">Claude Tools provides 12 commands to manage the GitFlow workflow. Each command includes its complete prompt.</p>
|
|
2239
2234
|
|
|
2240
|
-
<!-- Command: /gitflow
|
|
2235
|
+
<!-- Command: /gitflow init -->
|
|
2241
2236
|
<div class="command-card">
|
|
2242
2237
|
<div class="command-header">
|
|
2243
|
-
<code class="command-name">/gitflow
|
|
2238
|
+
<code class="command-name">/gitflow init</code>
|
|
2244
2239
|
<span class="tag tag-command">Setup</span>
|
|
2245
2240
|
</div>
|
|
2246
2241
|
<div class="command-body">
|
|
@@ -2252,15 +2247,15 @@ git merge --no-ff feature/my-feature</code></pre>
|
|
|
2252
2247
|
</p>
|
|
2253
2248
|
<div class="code-block">
|
|
2254
2249
|
<button class="copy-btn">Copy</button>
|
|
2255
|
-
<pre><code>/gitflow
|
|
2250
|
+
<pre><code>/gitflow init</code></pre>
|
|
2256
2251
|
</div>
|
|
2257
2252
|
</div>
|
|
2258
2253
|
</div>
|
|
2259
2254
|
|
|
2260
|
-
<!-- Command: /gitflow
|
|
2255
|
+
<!-- Command: /gitflow status -->
|
|
2261
2256
|
<div class="command-card">
|
|
2262
2257
|
<div class="command-header">
|
|
2263
|
-
<code class="command-name">/gitflow
|
|
2258
|
+
<code class="command-name">/gitflow status</code>
|
|
2264
2259
|
<span class="tag tag-command">Info</span>
|
|
2265
2260
|
</div>
|
|
2266
2261
|
<div class="command-body">
|
|
@@ -2272,18 +2267,18 @@ git merge --no-ff feature/my-feature</code></pre>
|
|
|
2272
2267
|
</p>
|
|
2273
2268
|
<div class="code-block">
|
|
2274
2269
|
<button class="copy-btn">Copy</button>
|
|
2275
|
-
<pre><code>/gitflow
|
|
2270
|
+
<pre><code>/gitflow status
|
|
2276
2271
|
|
|
2277
2272
|
# Voir toutes les branches avec migrations
|
|
2278
|
-
/gitflow
|
|
2273
|
+
/gitflow status --all-branches</code></pre>
|
|
2279
2274
|
</div>
|
|
2280
2275
|
</div>
|
|
2281
2276
|
</div>
|
|
2282
2277
|
|
|
2283
|
-
<!-- Command: /gitflow
|
|
2278
|
+
<!-- Command: /gitflow commit -->
|
|
2284
2279
|
<div class="command-card">
|
|
2285
2280
|
<div class="command-header">
|
|
2286
|
-
<code class="command-name">/gitflow
|
|
2281
|
+
<code class="command-name">/gitflow commit</code>
|
|
2287
2282
|
<span class="tag tag-command">Git</span>
|
|
2288
2283
|
</div>
|
|
2289
2284
|
<div class="command-body">
|
|
@@ -2295,7 +2290,7 @@ git merge --no-ff feature/my-feature</code></pre>
|
|
|
2295
2290
|
</p>
|
|
2296
2291
|
<div class="code-block">
|
|
2297
2292
|
<button class="copy-btn">Copy</button>
|
|
2298
|
-
<pre><code>/gitflow
|
|
2293
|
+
<pre><code>/gitflow commit</code></pre>
|
|
2299
2294
|
</div>
|
|
2300
2295
|
|
|
2301
2296
|
<div class="alert alert-info">
|
|
@@ -2314,70 +2309,70 @@ git merge --no-ff feature/my-feature</code></pre>
|
|
|
2314
2309
|
</div>
|
|
2315
2310
|
</div>
|
|
2316
2311
|
|
|
2317
|
-
<!-- Command: /gitflow
|
|
2312
|
+
<!-- Command: /gitflow plan -->
|
|
2318
2313
|
<div class="command-card">
|
|
2319
2314
|
<div class="command-header">
|
|
2320
|
-
<code class="command-name">/gitflow
|
|
2315
|
+
<code class="command-name">/gitflow plan</code>
|
|
2321
2316
|
<span class="tag tag-workflow">Planning</span>
|
|
2322
2317
|
</div>
|
|
2323
2318
|
<div class="command-body">
|
|
2324
2319
|
<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
|
|
2320
|
+
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
2321
|
</p>
|
|
2327
2322
|
<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
|
|
2323
|
+
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
2324
|
</p>
|
|
2330
2325
|
<div class="code-block">
|
|
2331
2326
|
<button class="copy-btn">Copy</button>
|
|
2332
|
-
<pre><code>/gitflow
|
|
2327
|
+
<pre><code>/gitflow plan</code></pre>
|
|
2333
2328
|
</div>
|
|
2334
2329
|
</div>
|
|
2335
2330
|
</div>
|
|
2336
2331
|
|
|
2337
|
-
<!-- Command: /gitflow
|
|
2332
|
+
<!-- Command: /gitflow merge -->
|
|
2338
2333
|
<div class="command-card">
|
|
2339
2334
|
<div class="command-header">
|
|
2340
|
-
<code class="command-name">/gitflow
|
|
2335
|
+
<code class="command-name">/gitflow merge</code>
|
|
2341
2336
|
<span class="tag tag-workflow">Execution</span>
|
|
2342
2337
|
</div>
|
|
2343
2338
|
<div class="command-body">
|
|
2344
2339
|
<p data-lang="fr">
|
|
2345
|
-
Cette commande execute le plan genere par /gitflow
|
|
2340
|
+
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
2341
|
</p>
|
|
2347
2342
|
<p data-lang="en">
|
|
2348
|
-
This command executes the plan generated by /gitflow
|
|
2343
|
+
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
2344
|
</p>
|
|
2350
2345
|
<div class="code-block">
|
|
2351
2346
|
<button class="copy-btn">Copy</button>
|
|
2352
|
-
<pre><code>/gitflow
|
|
2347
|
+
<pre><code>/gitflow merge</code></pre>
|
|
2353
2348
|
</div>
|
|
2354
2349
|
</div>
|
|
2355
2350
|
</div>
|
|
2356
2351
|
|
|
2357
|
-
<!-- Command: /gitflow
|
|
2352
|
+
<!-- Command: /gitflow abort -->
|
|
2358
2353
|
<div class="command-card">
|
|
2359
2354
|
<div class="command-header">
|
|
2360
|
-
<code class="command-name">/gitflow
|
|
2355
|
+
<code class="command-name">/gitflow abort</code>
|
|
2361
2356
|
<span class="tag tag-danger">Rollback</span>
|
|
2362
2357
|
</div>
|
|
2363
2358
|
<div class="command-body">
|
|
2364
2359
|
<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
|
|
2360
|
+
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
2361
|
</p>
|
|
2367
2362
|
<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
|
|
2363
|
+
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
2364
|
</p>
|
|
2370
2365
|
<div class="code-block">
|
|
2371
2366
|
<button class="copy-btn">Copy</button>
|
|
2372
|
-
<pre><code>/gitflow
|
|
2367
|
+
<pre><code>/gitflow abort</code></pre>
|
|
2373
2368
|
</div>
|
|
2374
2369
|
</div>
|
|
2375
2370
|
</div>
|
|
2376
2371
|
|
|
2377
|
-
<!-- Command: /gitflow
|
|
2372
|
+
<!-- Command: /gitflow pr -->
|
|
2378
2373
|
<div class="command-card">
|
|
2379
2374
|
<div class="command-header">
|
|
2380
|
-
<code class="command-name">/gitflow
|
|
2375
|
+
<code class="command-name">/gitflow pr</code>
|
|
2381
2376
|
<span class="tag tag-info">PR</span>
|
|
2382
2377
|
</div>
|
|
2383
2378
|
<div class="command-body">
|
|
@@ -2390,21 +2385,21 @@ git merge --no-ff feature/my-feature</code></pre>
|
|
|
2390
2385
|
<div class="code-block">
|
|
2391
2386
|
<button class="copy-btn">Copy</button>
|
|
2392
2387
|
<pre><code># PR vers develop (default)
|
|
2393
|
-
/gitflow
|
|
2388
|
+
/gitflow pr
|
|
2394
2389
|
|
|
2395
2390
|
# PR vers main (release/hotfix)
|
|
2396
|
-
/gitflow
|
|
2391
|
+
/gitflow pr main
|
|
2397
2392
|
|
|
2398
2393
|
# PR en draft
|
|
2399
|
-
/gitflow
|
|
2394
|
+
/gitflow pr --draft</code></pre>
|
|
2400
2395
|
</div>
|
|
2401
2396
|
</div>
|
|
2402
2397
|
</div>
|
|
2403
2398
|
|
|
2404
|
-
<!-- Command: /gitflow
|
|
2399
|
+
<!-- Command: /gitflow merge -->
|
|
2405
2400
|
<div class="command-card">
|
|
2406
2401
|
<div class="command-header">
|
|
2407
|
-
<code class="command-name">/gitflow
|
|
2402
|
+
<code class="command-name">/gitflow merge</code>
|
|
2408
2403
|
<span class="tag tag-success">Review</span>
|
|
2409
2404
|
</div>
|
|
2410
2405
|
<div class="command-body">
|
|
@@ -2417,21 +2412,21 @@ git merge --no-ff feature/my-feature</code></pre>
|
|
|
2417
2412
|
<div class="code-block">
|
|
2418
2413
|
<button class="copy-btn">Copy</button>
|
|
2419
2414
|
<pre><code># Review PR #123
|
|
2420
|
-
/gitflow
|
|
2415
|
+
/gitflow merge 123
|
|
2421
2416
|
|
|
2422
2417
|
# Focus securite
|
|
2423
|
-
/gitflow
|
|
2418
|
+
/gitflow merge 123 --security
|
|
2424
2419
|
|
|
2425
2420
|
# Focus migrations EF Core
|
|
2426
|
-
/gitflow
|
|
2421
|
+
/gitflow merge 123 --ef-core</code></pre>
|
|
2427
2422
|
</div>
|
|
2428
2423
|
</div>
|
|
2429
2424
|
</div>
|
|
2430
2425
|
|
|
2431
|
-
<!-- Command: /gitflow
|
|
2426
|
+
<!-- Command: /gitflow merge -->
|
|
2432
2427
|
<div class="command-card">
|
|
2433
2428
|
<div class="command-header">
|
|
2434
|
-
<code class="command-name">/gitflow
|
|
2429
|
+
<code class="command-name">/gitflow merge</code>
|
|
2435
2430
|
<span class="tag tag-primary">Merge</span>
|
|
2436
2431
|
</div>
|
|
2437
2432
|
<div class="command-body">
|
|
@@ -2444,21 +2439,21 @@ git merge --no-ff feature/my-feature</code></pre>
|
|
|
2444
2439
|
<div class="code-block">
|
|
2445
2440
|
<button class="copy-btn">Copy</button>
|
|
2446
2441
|
<pre><code># Merge PR #123
|
|
2447
|
-
/gitflow
|
|
2442
|
+
/gitflow merge 123
|
|
2448
2443
|
|
|
2449
2444
|
# Auto-merge quand CI vert
|
|
2450
|
-
/gitflow
|
|
2445
|
+
/gitflow merge 123 --auto
|
|
2451
2446
|
|
|
2452
2447
|
# Simulation
|
|
2453
|
-
/gitflow
|
|
2448
|
+
/gitflow merge 123 --dry-run</code></pre>
|
|
2454
2449
|
</div>
|
|
2455
2450
|
</div>
|
|
2456
2451
|
</div>
|
|
2457
2452
|
|
|
2458
|
-
<!-- Command: /gitflow
|
|
2453
|
+
<!-- Command: /gitflow start -->
|
|
2459
2454
|
<div class="command-card">
|
|
2460
2455
|
<div class="command-header">
|
|
2461
|
-
<code class="command-name">/gitflow
|
|
2456
|
+
<code class="command-name">/gitflow start</code>
|
|
2462
2457
|
<span class="tag tag-workflow">Branch</span>
|
|
2463
2458
|
</div>
|
|
2464
2459
|
<div class="command-body">
|
|
@@ -2471,16 +2466,16 @@ git merge --no-ff feature/my-feature</code></pre>
|
|
|
2471
2466
|
<div class="code-block">
|
|
2472
2467
|
<button class="copy-btn">Copy</button>
|
|
2473
2468
|
<pre><code># Demarrer une feature
|
|
2474
|
-
/gitflow
|
|
2469
|
+
/gitflow start feature authentication
|
|
2475
2470
|
|
|
2476
2471
|
# Demarrer une release (avec options avancees EF Core)
|
|
2477
|
-
/gitflow
|
|
2472
|
+
/gitflow start release
|
|
2478
2473
|
|
|
2479
2474
|
# Demarrer un hotfix
|
|
2480
|
-
/gitflow
|
|
2475
|
+
/gitflow start hotfix critical-bug
|
|
2481
2476
|
|
|
2482
2477
|
# Sans worktree (meme repertoire)
|
|
2483
|
-
/gitflow
|
|
2478
|
+
/gitflow start feature test --no-worktree</code></pre>
|
|
2484
2479
|
</div>
|
|
2485
2480
|
|
|
2486
2481
|
<div class="alert alert-info" style="margin-top: 1rem;">
|
|
@@ -2503,10 +2498,10 @@ git merge --no-ff feature/my-feature</code></pre>
|
|
|
2503
2498
|
</div>
|
|
2504
2499
|
</div>
|
|
2505
2500
|
|
|
2506
|
-
<!-- Command: /gitflow
|
|
2501
|
+
<!-- Command: /gitflow finish -->
|
|
2507
2502
|
<div class="command-card">
|
|
2508
2503
|
<div class="command-header">
|
|
2509
|
-
<code class="command-name">/gitflow
|
|
2504
|
+
<code class="command-name">/gitflow finish</code>
|
|
2510
2505
|
<span class="tag tag-workflow">Branch</span>
|
|
2511
2506
|
</div>
|
|
2512
2507
|
<div class="command-body">
|
|
@@ -2518,27 +2513,27 @@ git merge --no-ff feature/my-feature</code></pre>
|
|
|
2518
2513
|
</p>
|
|
2519
2514
|
<div class="code-block">
|
|
2520
2515
|
<button class="copy-btn">Copy</button>
|
|
2521
|
-
<pre><code>/gitflow
|
|
2516
|
+
<pre><code>/gitflow finish</code></pre>
|
|
2522
2517
|
</div>
|
|
2523
2518
|
</div>
|
|
2524
2519
|
</div>
|
|
2525
2520
|
|
|
2526
|
-
<!-- Command: /gitflow
|
|
2521
|
+
<!-- Command: /gitflow cleanup -->
|
|
2527
2522
|
<div class="command-card">
|
|
2528
2523
|
<div class="command-header">
|
|
2529
|
-
<code class="command-name">/gitflow
|
|
2524
|
+
<code class="command-name">/gitflow cleanup</code>
|
|
2530
2525
|
<span class="tag tag-workflow">Maintenance</span>
|
|
2531
2526
|
</div>
|
|
2532
2527
|
<div class="command-body">
|
|
2533
2528
|
<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
|
|
2529
|
+
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
2530
|
</p>
|
|
2536
2531
|
<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
|
|
2532
|
+
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
2533
|
</p>
|
|
2539
2534
|
<div class="code-block">
|
|
2540
2535
|
<button class="copy-btn">Copy</button>
|
|
2541
|
-
<pre><code>/gitflow
|
|
2536
|
+
<pre><code>/gitflow cleanup</code></pre>
|
|
2542
2537
|
</div>
|
|
2543
2538
|
</div>
|
|
2544
2539
|
</div>
|
|
@@ -2557,46 +2552,46 @@ git merge --no-ff feature/my-feature</code></pre>
|
|
|
2557
2552
|
<div class="code-block">
|
|
2558
2553
|
<button class="copy-btn">Copy</button>
|
|
2559
2554
|
<pre><code># 1. Initialiser GitFlow (une seule fois)
|
|
2560
|
-
/gitflow
|
|
2555
|
+
/gitflow init
|
|
2561
2556
|
|
|
2562
2557
|
# 2. Verifier l'etat du projet
|
|
2563
|
-
/gitflow
|
|
2558
|
+
/gitflow status
|
|
2564
2559
|
|
|
2565
2560
|
# 3. Demarrer une nouvelle feature
|
|
2566
|
-
/gitflow
|
|
2561
|
+
/gitflow start feature user-dashboard
|
|
2567
2562
|
|
|
2568
2563
|
# 4. Developper la feature...
|
|
2569
2564
|
# ... ecrire du code ...
|
|
2570
2565
|
|
|
2571
2566
|
# 5. Commits reguliers
|
|
2572
|
-
/gitflow
|
|
2567
|
+
/gitflow commit
|
|
2573
2568
|
|
|
2574
2569
|
# 6. Creer une Pull Request vers develop
|
|
2575
|
-
/gitflow
|
|
2570
|
+
/gitflow pr
|
|
2576
2571
|
|
|
2577
2572
|
# 7. Review de la PR (optionnel, peut etre fait par un collegue)
|
|
2578
|
-
/gitflow
|
|
2573
|
+
/gitflow merge 123
|
|
2579
2574
|
|
|
2580
2575
|
# 8. Merger la PR apres approbation
|
|
2581
|
-
/gitflow
|
|
2576
|
+
/gitflow merge 123
|
|
2582
2577
|
|
|
2583
2578
|
# 9. Preparer une release
|
|
2584
|
-
/gitflow
|
|
2579
|
+
/gitflow start release
|
|
2585
2580
|
|
|
2586
2581
|
# 10. Tests finaux et corrections mineures...
|
|
2587
|
-
/gitflow
|
|
2582
|
+
/gitflow commit
|
|
2588
2583
|
|
|
2589
2584
|
# 11. Creer PR vers main et merger
|
|
2590
|
-
/gitflow
|
|
2591
|
-
/gitflow
|
|
2585
|
+
/gitflow pr main
|
|
2586
|
+
/gitflow merge 456
|
|
2592
2587
|
|
|
2593
2588
|
# 12. Finaliser la release (tag + merge back + cleanup auto)
|
|
2594
|
-
/gitflow
|
|
2589
|
+
/gitflow finish
|
|
2595
2590
|
|
|
2596
2591
|
# La release est maintenant sur main avec un tag!
|
|
2597
2592
|
|
|
2598
2593
|
# 13. Maintenance: Audit des worktrees (depuis main ou develop)
|
|
2599
|
-
/gitflow
|
|
2594
|
+
/gitflow cleanup</code></pre>
|
|
2600
2595
|
</div>
|
|
2601
2596
|
|
|
2602
2597
|
<div class="alert alert-info">
|