Dear all, thank you Volker for this new release. However, it seems there is something wrong (at least for me). To synchronize my fork on GitHub, the system asks me to remove a commit (why ?). I clicked on that and now my fork is up to date with sagemath/sage:develop.
But if I want to synchronize the branch on my laptop using git pull, I get: ===== MAC-xxxxx:sage dcoudert$ git pull remote: Enumerating objects: 89, done. remote: Counting objects: 100% (85/85), done. remote: Compressing objects: 100% (7/7), done. remote: Total 89 (delta 74), reused 85 (delta 74), pack-reused 4 (from 1) Unpacking objects: 100% (89/89), 10.54 KiB | 158.00 KiB/s, done. >From https://github.com/dcoudert/sage + 8a8453f35f3...b8f98e7c7c3 develop -> origin/develop (forced update) f5655e9ec7a..acc03d4cb64 graphs/generation_of_trees -> origin/graphs/generation_of_trees cb79000d19b..4cf9b716978 graphs/preprocessing_for_minimal_separators -> origin/graphs/preprocessing_for_minimal_separators bbde4514017..5a72b6d4692 graphs/scream_if_immutable -> origin/graphs/scream_if_immutable 0e93faba371..9b08796194e graphs/use_biconnected_components_in_gomory_hu_tree -> origin/graphs/use_biconnected_components_in_gomory_hu_tree hint: You have divergent branches and need to specify how to reconcile them. hint: You can do so by running one of the following commands sometime before hint: your next pull: hint: hint: git config pull.rebase false # merge hint: git config pull.rebase true # rebase hint: git config pull.ff only # fast-forward only hint: hint: You can replace "git config" with "git config --global" to set a default hint: preference for all repositories. You can also pass --rebase, --no-rebase, hint: or --ff-only on the command line to override the configured default per hint: invocation. fatal: Need to specify how to reconcile divergent branches. ===== I don't know which is the correct way to solve that. Furthermore, I see that many (almost all) of the pull requests (https://github.com/sagemath/sage/pulls) have merge conflicts. I don't know if others are experiencing / observing the same issues, and I don't know how to fix that. Best, David. On Tuesday, April 1, 2025 at 12:57:53 AM UTC+2 Volker Braun wrote: > The "master" git branch has been updated to Sage-10.6. As always, you can > get the latest beta version from the "develop" git branch. Alternatively, > the self-contained source tarball is at > http://www.sagemath.org/download-latest.html > > There was no change over rc1: > > b8f98e7c7c3 (tag: 10.6, github/develop) Updated SageMath version to 10.6 > 10741006a47 Updated SageMath version to 10.6.rc1 > -- You received this message because you are subscribed to the Google Groups "sage-release" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion visit https://groups.google.com/d/msgid/sage-release/4e629e88-cfda-4ebc-b046-fc789dab2af4n%40googlegroups.com.
