Skip to content

Commit c1eb792

Browse files
committed
Simplify branch diagram
- remove 3.1.4 - we never merge between vX.Y-dev branches, they diverge too much
1 parent 5f46ea3 commit c1eb792

File tree

1 file changed

+7
-21
lines changed

1 file changed

+7
-21
lines changed

CONTRIBUTING.md

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -375,14 +375,14 @@ config:
375375
git2: "#eedd88"
376376
git3: "#ccbb66"
377377
git4: "#aa9944"
378-
git5: "#887722"
379-
git6: "#99ccff"
380-
git7: "#77aadd"
378+
git5: "#44ff77"
379+
git6: "#22cc22"
380+
git7: "#11aa11"
381381
gitBranchLabel1: "#000000"
382382
gitBranchLabel2: "#000000"
383383
gitBranchLabel3: "#000000"
384384
gitBranchLabel4: "#000000"
385-
gitBranchLabel5: "#ffffff"
385+
gitBranchLabel5: "#000000"
386386
gitBranchLabel6: "#000000"
387387
gitBranchLabel7: "#000000"
388388
---
@@ -397,9 +397,8 @@ gitGraph TB:
397397
commit id:"update version in src/oas.md to 3.2.0"
398398
commit id:"some 3.2.0 work"
399399
checkout v3.1-dev
400-
commit id:"a 3.1.x fix"
401-
checkout v3.2-dev
402-
merge v3.1-dev id:"merge 3.1.2 fixes"
400+
commit id:"a 3.1.2 fix"
401+
403402
checkout v3.1-dev
404403
branch v3.1.2-rel order:3
405404
commit id:"rename src/oas.md to versions/3.1.2.md"
@@ -416,10 +415,9 @@ gitGraph TB:
416415
commit id:"more 3.2.0 work"
417416
checkout v3.1-dev
418417
commit id:"update version in src/oas.md to 3.1.3"
419-
commit id:"another 3.1.x fix"
418+
commit id:"a 3.1.3 fix"
420419
checkout v3.2-dev
421420
commit id:"still more 3.2.0 work"
422-
merge v3.1-dev id:"merge 3.1.3 fixes before releasing"
423421
424422
checkout v3.1-dev
425423
branch v3.1.3-rel order:4
@@ -448,30 +446,18 @@ gitGraph TB:
448446
449447
checkout v3.2-dev
450448
branch v3.3-dev order:9
451-
checkout v3.1-dev
452-
commit id:"update version in src/oas.md to 3.1.4"
453449
checkout v3.2-dev
454450
commit id:"update version in src/oas.md to 3.2.1"
455451
checkout v3.3-dev
456452
commit id:"update version in src/oas.md to 3.3.0"
457453
458-
checkout v3.1-dev
459-
commit id:"a 3.1.4 fix"
460454
checkout v3.2-dev
461455
commit id:"a 3.2.1 fix"
462-
merge v3.1-dev id:"merge 3.1.4 fixes before releasing"
463-
checkout v3.3-dev
464-
merge v3.2-dev id:"merge 3.1.4 / 3.2.1 fixes"
465456
466-
checkout v3.1-dev
467-
branch v3.1.4-rel order:5
468-
commit id:"rename src/oas.md to versions/3.1.4.md"
469457
checkout v3.2-dev
470458
branch v3.2.1-rel order:8
471459
commit id:"rename src/oas.md to versions/3.2.1.md"
472460
473-
checkout main
474-
merge v3.1.4-rel tag:"3.1.4"
475461
checkout dev
476462
merge main id:" auto-sync from main"
477463
checkout v3.1-dev

0 commit comments

Comments
 (0)