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.
=====[spkg-install] In file included from src/gfanlib_zcone.cpp:8:[spkg-install] In file included from src/gfanlib_zcone.h:11:[spkg-install] src/gfanlib_matrix.h:123:18: error: no member named 'vectormultiply' in 'Matrix<typ>'[spkg-install] 123 | ret[i]=a.vectormultiply(b.column(i));[spkg-install] | ~ ^[spkg-install] 1 error generated.[spkg-install] make[5]: *** [src/gfanlib_zcone.o] Error 1[spkg-install] ********************************************************************************[spkg-install] Error building gfan-0.6.2.p1[spkg-install] ********************************************************************************
[spkg-build] In file included from Ldokchitser.cc:1:[spkg-build] In file included from ./L.h:43:[spkg-build] In file included from ./Lglobals.h:55:[spkg-build] ./Lcomplex.h:79:51: error: reference to 'complex' is ambiguous[spkg-build] 79 | template<typename _Tp> complex<_Tp> log10(const complex<_Tp>&);[spkg-build] | ^[spkg-build] ./Lcomplex.h:62:32: note: candidate found by name lookup is 'std::complex'[spkg-build] 62 | template<typename _Tp> class complex;[spkg-build] | ^[spkg-build] /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/c++/v1/__fwd/complex.h:22:28: note: candidate found by name lookup is 'std::__1::complex'[spkg-build] 22 | class _LIBCPP_TEMPLATE_VIS complex;[spkg-build] | ^[spkg-build] fatal error: too many errors emitted, stopping now [-ferror-limit=][spkg-build] 20 errors generated.[spkg-build] make[6]: *** [Ldokchitser.lo] Error 1[spkg-build] make[5]: *** [all-recursive] Error 1[spkg-build] ********************************************************************************[spkg-build] Error building lcalc-2.0.5[spkg-build] ********************************************************************************
> fastfetch -l none------------------------OS: macOS Sequoia 15.4 arm64Host: Mac mini (M2, 2023, Four Thunderbolt 4 ports)Kernel: Darwin 24.4.0Uptime: 11 hours, 8 minsPackages: 270 (brew), 23 (brew-cask)Shell: bash 5.2.37Display (DELL U2515H): 2560x1440 @ 60 Hz in 25" [External] *Display (LED Cinema Display): 2560x1440 @ 60 Hz in 27" [External]DE: AquaWM: Quartz Compositor 278.4.7WM Theme: Multicolor (Light)Font: .AppleSystemUIFont [System], Helvetica [User]Cursor: Fill - Black, Outline - White (32px)Terminal: tmux 3.5aCPU: Apple M2 Pro (12) @ 3.50 GHzGPU: Apple M2 Pro (19) @ 1.40 GHz [Integrated]Memory: 16.30 GiB / 32.00 GiB (51%)Swap: DisabledDisk (/): 133.97 GiB / 1.81 TiB (7%) - apfs [Read-only]Disk (/Volumes/External SSD): 286.95 MiB / 1.82 TiB (0%) - apfs [External]Local IP (en1): 10.0.0.143/24Locale: en_US.UTF-8
--
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 sage-release...@googlegroups.com.
To view this discussion visit https://groups.google.com/d/msgid/sage-release/4e629e88-cfda-4ebc-b046-fc789dab2af4n%40googlegroups.com.
--
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 sage-release...@googlegroups.com.
To view this discussion visit https://groups.google.com/d/msgid/sage-release/49629D68-1D04-4AA6-A192-9DCD8A9AF67E%40gmail.com.
Best regards, Kenji01/04/2025 22:54、Volker Braun <vbrau...@gmail.com>のメール:
--
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 sage-release...@googlegroups.com.
To view this discussion visit https://groups.google.com/d/msgid/sage-release/e83e64a8-831f-48a2-b8c1-15a42533ea5dn%40googlegroups.com.
--
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 sage-release...@googlegroups.com.
To view this discussion visit https://groups.google.com/d/msgid/sage-release/49629D68-1D04-4AA6-A192-9DCD8A9AF67E%40gmail.com.
* package: linbox-1.7.0+sage-2024-05-18
last build time: May 2 22:20
log file: /Users/iohara/Desktop/sage-10.7.beta2/logs/pkgs/linbox-1.7.0+sage-2024-05-18.log
build directory: /Users/iohara/Desktop/sage-10.7.beta2/local/var/tmp/sage/build/linbox-1.7.0+sage-2024-05-18
* package: gfan-0.6.2.p1
last build time: May 2 22:38
log file: /Users/iohara/Desktop/sage-10.7.beta2/logs/pkgs/gfan-0.6.2.p1.log
build directory: /Users/iohara/Desktop/sage-10.7.beta2/local/var/tmp/sage/build/gfan-0.6.2.p1
--
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 sage-release...@googlegroups.com.
To view this discussion visit https://groups.google.com/d/msgid/sage-release/241780C6-A086-4E02-B800-3DF335F8C2C8%40gmail.com.
Kenji02/05/2025 21:26、Dima Pasechnik <dim...@gmail.com>のメール:
To view this discussion visit https://groups.google.com/d/msgid/sage-release/CAAWYfq0eTNUdworybdKO%2BHjvi6QtFhVbH%3DLjT6OxhwxX2YM%3DCQ%40mail.gmail.com.
--
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 sage-release...@googlegroups.com.
To view this discussion visit https://groups.google.com/d/msgid/sage-release/241780C6-A086-4E02-B800-3DF335F8C2C8%40gmail.com.