Commit c5efa62
committed
chore: merge develop into PR branch to resolve CHANGELOG conflict
Resolves merge conflict in CHANGELOG.md [Unreleased] / ### Fixed by
combining the PR's tools/test-local.sh entry with the entries added on
develop since the PR was opened (#2791, #2790, model SELECT $quoteIdentifier,
#2786, #2779, #2792). Newest-first ordering preserved; (#2796) suffix
added to the PR's entry to match the recent-entry convention.
No code changes — only CHANGELOG ordering.
Signed-off-by: Peter Amiri <peter@alurium.com>28 files changed
Lines changed: 836 additions & 52 deletions
File tree
- .ai/wheels/testing
- cli/lucli
- tests/specs/commands
- vendor/wheels
- events
- init
- mapper
- model
- tests/specs
- global
- mapper
- model
- wheelstest
- wheelstest
- web/sites/guides/src/content/docs
- v4-0-0
- command-line-tools/wheels-commands
- core-concepts
- digging-deeper
- testing
- v4-0-1-snapshot
- basics
- command-line-tools/wheels-commands
- core-concepts
- digging-deeper
- testing
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
64 | 64 | | |
65 | 65 | | |
66 | 66 | | |
67 | | - | |
| 67 | + | |
68 | 68 | | |
69 | 69 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
25 | | - | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
26 | 30 | | |
| 31 | + | |
27 | 32 | | |
28 | 33 | | |
| 34 | + | |
29 | 35 | | |
30 | 36 | | |
31 | 37 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2089 | 2089 | | |
2090 | 2090 | | |
2091 | 2091 | | |
| 2092 | + | |
| 2093 | + | |
| 2094 | + | |
| 2095 | + | |
| 2096 | + | |
| 2097 | + | |
| 2098 | + | |
| 2099 | + | |
| 2100 | + | |
| 2101 | + | |
| 2102 | + | |
| 2103 | + | |
| 2104 | + | |
| 2105 | + | |
2092 | 2106 | | |
2093 | 2107 | | |
2094 | 2108 | | |
2095 | 2109 | | |
2096 | 2110 | | |
2097 | 2111 | | |
2098 | 2112 | | |
2099 | | - | |
2100 | | - | |
2101 | | - | |
2102 | | - | |
2103 | | - | |
2104 | | - | |
2105 | | - | |
2106 | | - | |
2107 | | - | |
2108 | | - | |
2109 | | - | |
2110 | | - | |
2111 | | - | |
2112 | | - | |
2113 | 2113 | | |
2114 | 2114 | | |
2115 | 2115 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
76 | 76 | | |
77 | 77 | | |
78 | 78 | | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
79 | 143 | | |
80 | 144 | | |
0 commit comments