Commit 2c0c2d5
committed
Merge branch 'main' into develop
One-time back-merge to ingest main's accumulated Dependabot/codegen squash-commits (#120, #123, #125, #127, #128, #129) into develop so the develop → main release PR (#131) can land as a clean merge-commit. From this point forward the new branching model takes effect: develop is forward-only and develop → main uses merge-commit (preserving develop's history on main as the second parent), eliminating the need for back-merges like this one.
# Conflicts:
# .github/workflows/build-release-task.yml
# .github/workflows/merge-bot-pull-request.yml7 files changed
Lines changed: 298 additions & 60 deletions
File tree
- LanguageData
- LanguageTags
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
4 | | - | |
5 | | - | |
6 | | - | |
7 | | - | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
13 | | - | |
| 13 | + | |
14 | 14 | | |
15 | 15 | | |
16 | 16 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1532 | 1532 | | |
1533 | 1533 | | |
1534 | 1534 | | |
1535 | | - | |
| 1535 | + | |
1536 | 1536 | | |
1537 | 1537 | | |
1538 | 1538 | | |
| |||
2617 | 2617 | | |
2618 | 2618 | | |
2619 | 2619 | | |
2620 | | - | |
| 2620 | + | |
2621 | 2621 | | |
2622 | 2622 | | |
2623 | 2623 | | |
| |||
2662 | 2662 | | |
2663 | 2663 | | |
2664 | 2664 | | |
2665 | | - | |
| 2665 | + | |
2666 | 2666 | | |
2667 | 2667 | | |
2668 | 2668 | | |
| |||
3070 | 3070 | | |
3071 | 3071 | | |
3072 | 3072 | | |
3073 | | - | |
| 3073 | + | |
3074 | 3074 | | |
3075 | 3075 | | |
3076 | 3076 | | |
| |||
3349 | 3349 | | |
3350 | 3350 | | |
3351 | 3351 | | |
3352 | | - | |
| 3352 | + | |
3353 | 3353 | | |
3354 | 3354 | | |
3355 | 3355 | | |
| |||
3903 | 3903 | | |
3904 | 3904 | | |
3905 | 3905 | | |
3906 | | - | |
| 3906 | + | |
3907 | 3907 | | |
3908 | 3908 | | |
3909 | 3909 | | |
| |||
3924 | 3924 | | |
3925 | 3925 | | |
3926 | 3926 | | |
3927 | | - | |
| 3927 | + | |
3928 | 3928 | | |
3929 | 3929 | | |
3930 | 3930 | | |
| |||
6066 | 6066 | | |
6067 | 6067 | | |
6068 | 6068 | | |
6069 | | - | |
| 6069 | + | |
6070 | 6070 | | |
6071 | 6071 | | |
6072 | 6072 | | |
| |||
6209 | 6209 | | |
6210 | 6210 | | |
6211 | 6211 | | |
6212 | | - | |
| 6212 | + | |
6213 | 6213 | | |
6214 | 6214 | | |
6215 | 6215 | | |
| |||
6658 | 6658 | | |
6659 | 6659 | | |
6660 | 6660 | | |
| 6661 | + | |
6661 | 6662 | | |
6662 | 6663 | | |
6663 | 6664 | | |
| |||
6963 | 6964 | | |
6964 | 6965 | | |
6965 | 6966 | | |
6966 | | - | |
| 6967 | + | |
6967 | 6968 | | |
6968 | 6969 | | |
6969 | 6970 | | |
| |||
7606 | 7607 | | |
7607 | 7608 | | |
7608 | 7609 | | |
7609 | | - | |
| 7610 | + | |
7610 | 7611 | | |
7611 | 7612 | | |
7612 | 7613 | | |
| |||
7793 | 7794 | | |
7794 | 7795 | | |
7795 | 7796 | | |
| 7797 | + | |
7796 | 7798 | | |
7797 | 7799 | | |
7798 | 7800 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
9398 | 9398 | | |
9399 | 9399 | | |
9400 | 9400 | | |
9401 | | - | |
| 9401 | + | |
9402 | 9402 | | |
9403 | 9403 | | |
9404 | 9404 | | |
| |||
16111 | 16111 | | |
16112 | 16112 | | |
16113 | 16113 | | |
16114 | | - | |
| 16114 | + | |
16115 | 16115 | | |
16116 | 16116 | | |
16117 | 16117 | | |
| |||
16392 | 16392 | | |
16393 | 16393 | | |
16394 | 16394 | | |
16395 | | - | |
| 16395 | + | |
16396 | 16396 | | |
16397 | 16397 | | |
16398 | 16398 | | |
| |||
18901 | 18901 | | |
18902 | 18902 | | |
18903 | 18903 | | |
18904 | | - | |
| 18904 | + | |
18905 | 18905 | | |
18906 | 18906 | | |
18907 | 18907 | | |
| |||
20608 | 20608 | | |
20609 | 20609 | | |
20610 | 20610 | | |
20611 | | - | |
| 20611 | + | |
20612 | 20612 | | |
20613 | 20613 | | |
20614 | 20614 | | |
| |||
24002 | 24002 | | |
24003 | 24003 | | |
24004 | 24004 | | |
24005 | | - | |
| 24005 | + | |
24006 | 24006 | | |
24007 | 24007 | | |
24008 | 24008 | | |
| |||
24132 | 24132 | | |
24133 | 24133 | | |
24134 | 24134 | | |
24135 | | - | |
| 24135 | + | |
24136 | 24136 | | |
24137 | 24137 | | |
24138 | 24138 | | |
| |||
37254 | 37254 | | |
37255 | 37255 | | |
37256 | 37256 | | |
37257 | | - | |
| 37257 | + | |
37258 | 37258 | | |
37259 | 37259 | | |
37260 | 37260 | | |
| |||
38134 | 38134 | | |
38135 | 38135 | | |
38136 | 38136 | | |
38137 | | - | |
| 38137 | + | |
38138 | 38138 | | |
38139 | 38139 | | |
38140 | 38140 | | |
| |||
40889 | 40889 | | |
40890 | 40890 | | |
40891 | 40891 | | |
| 40892 | + | |
| 40893 | + | |
| 40894 | + | |
| 40895 | + | |
| 40896 | + | |
| 40897 | + | |
40892 | 40898 | | |
40893 | 40899 | | |
40894 | 40900 | | |
| |||
42763 | 42769 | | |
42764 | 42770 | | |
42765 | 42771 | | |
42766 | | - | |
| 42772 | + | |
42767 | 42773 | | |
42768 | 42774 | | |
42769 | 42775 | | |
| |||
46645 | 46651 | | |
46646 | 46652 | | |
46647 | 46653 | | |
46648 | | - | |
| 46654 | + | |
46649 | 46655 | | |
46650 | 46656 | | |
46651 | 46657 | | |
| |||
47777 | 47783 | | |
47778 | 47784 | | |
47779 | 47785 | | |
| 47786 | + | |
| 47787 | + | |
| 47788 | + | |
| 47789 | + | |
| 47790 | + | |
| 47791 | + | |
47780 | 47792 | | |
47781 | 47793 | | |
47782 | 47794 | | |
| |||
0 commit comments