Skip to content

Merge main into rc - #33

Merged
jwrosewell merged 3 commits into
rcfrom
merge/main-into-rc
Nov 16, 2026
Merged

jwrosewell merged 3 commits into
rcfrom
merge/main-into-rc

Conversation

@jwrosewell

@jwrosewell jwrosewell commented Nov 15, 2026 •

Copy link
Copy Markdown
Contributor

Problem

Each release reaches main as one squashed commit, so main holds a commit that rc does not. The release build merges main into the next release head, and that merge conflicts in every file rc has changed since the last release, so the build stops in Configure before anything is built.

What changed

One merge commit, with rc (c7ca30f4) and main (e8605df3) as parents and rc's tree unchanged. Nothing in the files changes. These are the commits main holds that rc did not, each checked before the merge was made:

  • 389d51b9 is the squash of #24, whose head 345a4a64 is in rc's history, and the two commits have the same tree.
  • e8605df3 is the squash of #27, whose head c7ca30f4 is in rc's history, and the two commits have the same tree.

Because each squash has the same tree as a commit already in rc's history, keeping rc's side loses nothing.

Checks

This changes no file, so it merges on its quick checks and a review, without a full build. Merge it with a merge commit, not a squash, so that main stays a parent.

Both checks ran on the head 16623e3 and passed, being Build and test, run 43757588309 (build-and-test and Browsers on ubuntu-latest, ubuntu-22.04-arm and ubuntu-24.04-arm), and Only rc into main, run 43757588575.

jwrosewell and others added 3 commits November 10, 2026 16:38
* Find the Java example in 51degrees-java (#16)

* Find the dotnet example in 51degrees-dotnet (#17)

device-detection-dotnet-examples has moved into 51degrees-dotnet, under
examples/device-detection. Both dotnet demos, pmp-web and GettingStarted-Web,
are found there as siblings, and the docs name the monorepo.

* Find the Node example in 51degrees-node (#18)

* Find the Node example in 51degrees-node

* Copy the monorepo packages in when installing the Node example

* Check that only rc merges into the default branch (#19)

* Find the Python example in 51degrees-python (#20)

* Find the PHP example in 51degrees-php (#21)

* Java uses the default JSON endpoint and still accepts the old one (#23)

* Let Java use the default JSON endpoint and still accept its old one

* Say once which JSON path each language uses

---------

Co-authored-by: ben51degrees <ben@51degrees.com>
Co-authored-by: Jamesr51d <122470673+Jamesr51d@users.noreply.github.com>
Co-authored-by: Eugene Dorfman <justadreamer2007@gmail.com>
* Find the Java example in 51degrees-java (#16)

* Find the dotnet example in 51degrees-dotnet (#17)

device-detection-dotnet-examples has moved into 51degrees-dotnet, under
examples/device-detection. Both dotnet demos, pmp-web and GettingStarted-Web,
are found there as siblings, and the docs name the monorepo.

* Find the Node example in 51degrees-node (#18)

* Find the Node example in 51degrees-node

* Copy the monorepo packages in when installing the Node example

* Check that only rc merges into the default branch (#19)

* Find the Python example in 51degrees-python (#20)

* Find the PHP example in 51degrees-php (#21)

* Java uses the default JSON endpoint and still accepts the old one (#23)

* Let Java use the default JSON endpoint and still accept its old one

* Say once which JSON path each language uses

* Give the .NET example the _51DEGREES_ variable names alongside the old ones (#25)

* Test that the .NET example is given the underscore variable names

The .NET cloud web example reads the resource key from
_51DEGREES_RESOURCE_KEY and the cloud endpoint from
_51DEGREES_CLOUD_ENDPOINT, with no other name, once its rename is
released.

* Give the .NET example the _51DEGREES_ variable names

The .NET cloud web example now reads the resource key from
_51DEGREES_RESOURCE_KEY and the endpoint from _51DEGREES_CLOUD_ENDPOINT,
with no other name. Released versions of it read SUPER_RESOURCE_KEY and
FIFTYONE_CLOUD_ENDPOINT, so the harness sets both pairs until every
language has released with the new names.

---------

Co-authored-by: ben51degrees <ben@51degrees.com>
Co-authored-by: Jamesr51d <122470673+Jamesr51d@users.noreply.github.com>
Co-authored-by: Eugene Dorfman <justadreamer2007@gmail.com>
Each commit main holds that rc does not is the squashed merge of an rc into main release whose content rc already holds, so this merge keeps rc's tree unchanged and only records main as a parent. Without it, merging main into a later release head conflicts in every file rc has changed since that release.
@jwrosewell
jwrosewell marked this pull request as ready for review November 16, 2026 11:33
@jwrosewell
jwrosewell merged commit ce2a222 into rc Nov 16, 2026
5 checks passed
@jwrosewell jwrosewell mentioned this pull request Nov 16, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant