Commit 49f548e
Merge main into cran-submission
Same three-way conflict as the previous main → cran-submission merge:
* DESCRIPTION — kept the 0.1.0 release Title and version from
cran-submission. Main's dev version (0.0.0.9054 after #218) is
superseded.
* NEWS.md — kept cran-submission's "first CRAN release" intro and
0.1.0 structure. All of main's incoming dev-version bullets
(#218 R toolchain + gh issue allowlist, findjags casing,
#210/#216/#217, OS-snapshot consolidation, Copilot decomposition)
are already represented under ## Developer-facing changes from
the prior merge and the "Incorporate PR #218 changes" cherry,
so the main-side block is dropped rather than re-merged.
* inst/WORDLIST — union of both branches, ASCII-sorted, CRLF
preserved.
Workflow files (.github/workflows/{claude,copilot-setup-steps,
test-coverage}.yml) auto-merged to main's version, so cran-submission
now inherits #218's @claude R toolchain, gh issue allowlist, and
the lowercase runjags::findjags() consistency fix in test-coverage
and copilot-setup.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>3 files changed
Lines changed: 52 additions & 8 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
24 | | - | |
| 24 | + | |
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
| |||
30 | 30 | | |
31 | 31 | | |
32 | 32 | | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
33 | 75 | | |
34 | 76 | | |
35 | 77 | | |
| |||
86 | 128 | | |
87 | 129 | | |
88 | 130 | | |
89 | | - | |
90 | | - | |
91 | | - | |
92 | | - | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
93 | 137 | | |
94 | 138 | | |
95 | 139 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
102 | 102 | | |
103 | 103 | | |
104 | 104 | | |
105 | | - | |
| 105 | + | |
106 | 106 | | |
107 | 107 | | |
108 | 108 | | |
| |||
119 | 119 | | |
120 | 120 | | |
121 | 121 | | |
122 | | - | |
| 122 | + | |
123 | 123 | | |
124 | 124 | | |
125 | 125 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
58 | 58 | | |
59 | 59 | | |
60 | 60 | | |
61 | | - | |
| 61 | + | |
62 | 62 | | |
63 | 63 | | |
64 | 64 | | |
| |||
0 commit comments