Repository navigation
Merge main into rc - #33
Merged
Merged
Conversation
* 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.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Problem
Each release reaches
mainas one squashed commit, somainholds a commit thatrcdoes not. The release build mergesmaininto the next release head, and that merge conflicts in every filerchas changed since the last release, so the build stops in Configure before anything is built.What changed
One merge commit, with
rc(c7ca30f4) andmain(e8605df3) as parents andrc's tree unchanged. Nothing in the files changes. These are the commitsmainholds thatrcdid not, each checked before the merge was made:389d51b9is the squash of #24, whose head345a4a64is inrc's history, and the two commits have the same tree.e8605df3is the squash of #27, whose headc7ca30f4is inrc'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, keepingrc'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
mainstays 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.