Skip to content

Conversation

lrytz
Copy link
Member

@lrytz lrytz commented Sep 1, 2025

$> git log HEAD --oneline -n 1 | cat
d66a09ddf5 Merge pull request #11098 from sjrd/range-unsigned-arith

$> git log upstream/2.12.x --oneline -n 1 | cat
23ab8838c0 Merge pull request #11117 from lrytz/ij-clean

$> export MB=$(git merge-base HEAD upstream/2.12.x)

$> git log --graph --oneline $MB..upstream/2.12.x | cat
*   23ab8838c0 Merge pull request #11117 from lrytz/ij-clean
|\
| * ae3538b4a1 Backport 'Remove custom IntelliJ project files'
| * aad0070641 Backport: disable bsp / IntelliJ for non-code sbt projects
|/
*   1e47d0dddb Merge pull request #11115 from SethTisue/setup-java-5
|\
| * 4f124dafec CI: upgrade setup-java to v5
* |   243c214fbe Merge pull request #11113 from scala-steward/update/2.12.x/sbt-develocity-1.3.1
|\ \
| |/
|/|
| * 0b11d878b8 Update sbt-develocity to 1.3.1 in 2.12.x
* |   197eff962a Merge pull request #11114 from scala-steward/update/2.12.x/sbt-1.11.5
|\ \
| |/
|/|
| * 5227add3c5 Update sbt, scripted-plugin to 1.11.5 in 2.12.x
|/
*   156d22a5f6 Merge pull request #11107 from SethTisue/checkout-5
|\
| * 054572919c CI: update actions/checkout to v5 (was v4)
|/
*   f8610166a5 Merge pull request #11105 from som-snytt/backport/13116
|\
| * e043e31962 Backport missing interpolator skips unpositioned literal
|/
*   16165fa0a2 Merge pull request #11102 from scala-steward/update/2.12.x/sbt-1.11.4
|\
| * 1d2e7be449 Update sbt, scripted-plugin to 1.11.4 in 2.12.x
|/
*   715766e882 Merge pull request #11096 from scala-steward/update/2.12.x/sbt-develocity-1.3
|\
| * d06d1af605 Update sbt-develocity to 1.3 in 2.12.x
* a369329cc7 Merge pull request #11095 from scala-steward/update/2.12.x/jackson-module-scala-2.19.2
* e758849315 Update jackson-module-scala to 2.19.2 in 2.12.x

$> g merge a369329cc7 -s ours

$> g merge 16165fa0a2

$> g merge f8610166a5 -s ours

$> g merge 1e47d0dddb

scala-steward and others added 20 commits July 25, 2025 19:03
…on-module-scala-2.19.2

Update jackson-module-scala to 2.19.2 in 2.12.x
…evelocity-1.3

Update sbt-develocity to 1.3 in 2.12.x
….11.4

Update sbt, scripted-plugin to 1.11.4 in 2.12.x
Backport missing interpolator skips unpositioned literal
CI: update actions/checkout to v5 (was v4)
….11.5

Update sbt, scripted-plugin to 1.11.5 in 2.12.x
Dependabot submitted this on 2.13.x; I'm resubmitting on 2.12.x
instead, plus Yoshida-san changed our Dependabot branch settings
so any future upgrades will go to 2.12.x
…evelocity-1.3.1

Update sbt-develocity to 1.3.1 in 2.12.x
@lrytz lrytz added the internal not resulting in user-visible changes (build changes, tests, internal cleanups) label Sep 1, 2025
@scala-jenkins scala-jenkins added this to the 2.13.17 milestone Sep 1, 2025
@lrytz lrytz merged commit 6548d29 into scala:2.13.x Sep 1, 2025
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
internal not resulting in user-visible changes (build changes, tests, internal cleanups)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants