Fri Oct 10 05:00:01 AM UTC 2025
error: Your local changes to the following files would be overwritten by merge: bin/run-tests.sh Please commit your changes or stash them before you merge. Aborting Updating 56db326df..6de809723 Submodule path 'cmake': checked out '904fc6f612dc19cbd07f6943050cf62cad71ab3e' Submodule path 'contrib/as2js': checked out 'a7e0e755350e09c75ad9973f4b7a22c52c6475b8' Submodule path 'contrib/basic-xml': checked out '34bc375a489141f81efcbc0149dc25c1096ef928' Submodule path 'contrib/ipmgr': checked out '20d8637e383ee834e5bff16dd092cd3f5a37f76a' Submodule path 'contrib/snaplogger': checked out 'a10bbba34cea9e5bf8a17d53b5f6914c4fa2e734' Submodule path 'contrib/versiontheca': checked out '1ac7a7ac1132253c634ea97c9e340a3a12946a5a' /home/alexis/snapwebsites/snapcpp/cmake ---------------- /home/alexis/snapwebsites/snapcpp/cmake Not Up to Date $ git status . HEAD detached at 904fc6f nothing to commit, working tree clean $ git checkout main Previous HEAD position was 904fc6f Properly use PROJECT_NAME instead of snapdev directly. Switched to branch 'main' Your branch is up to date with 'origin/main'. $ git pull Already up to date. /home/alexis/snapwebsites/snapcpp/contrib/advgetopt /home/alexis/snapwebsites/snapcpp/contrib/as2js ---------------- /home/alexis/snapwebsites/snapcpp/contrib/as2js Not Up to Date $ git status . HEAD detached at a7e0e75 nothing to commit, working tree clean $ git checkout main Previous HEAD position was a7e0e75 Small doxy clean ups. Switched to branch 'main' Your branch is up to date with 'origin/main'. $ git pull Already up to date. /home/alexis/snapwebsites/snapcpp/contrib/basic-xml ---------------- /home/alexis/snapwebsites/snapcpp/contrib/basic-xml Not Up to Date $ git status . HEAD detached at 34bc375 nothing to commit, working tree clean $ git checkout main Previous HEAD position was 34bc375 Small doxy clean ups. Switched to branch 'main' Your branch is up to date with 'origin/main'. $ git pull Already up to date. /home/alexis/snapwebsites/snapcpp/contrib/cluck /home/alexis/snapwebsites/snapcpp/contrib/commonmarkcpp /home/alexis/snapwebsites/snapcpp/contrib/communicatord /home/alexis/snapwebsites/snapcpp/contrib/cppthread /home/alexis/snapwebsites/snapcpp/contrib/csspp /home/alexis/snapwebsites/snapcpp/contrib/edhttp /home/alexis/snapwebsites/snapcpp/contrib/eventdispatcher /home/alexis/snapwebsites/snapcpp/contrib/fastjournal /home/alexis/snapwebsites/snapcpp/contrib/fluid-settings /home/alexis/snapwebsites/snapcpp/contrib/ftmesh /home/alexis/snapwebsites/snapcpp/contrib/iplock /home/alexis/snapwebsites/snapcpp/contrib/ipmgr ---------------- /home/alexis/snapwebsites/snapcpp/contrib/ipmgr Not Up to Date $ git status . HEAD detached at 20d8637 nothing to commit, working tree clean $ git checkout main Previous HEAD position was 20d8637 Small doxy clean ups. Switched to branch 'main' Your branch is up to date with 'origin/main'. $ git pull Already up to date. /home/alexis/snapwebsites/snapcpp/contrib/libaddr /home/alexis/snapwebsites/snapcpp/contrib/libexcept /home/alexis/snapwebsites/snapcpp/contrib/libmimemail /home/alexis/snapwebsites/snapcpp/contrib/libtld /home/alexis/snapwebsites/snapcpp/contrib/libutf8 /home/alexis/snapwebsites/snapcpp/contrib/murmur3 /home/alexis/snapwebsites/snapcpp/contrib/prinbee /home/alexis/snapwebsites/snapcpp/contrib/safepasswords /home/alexis/snapwebsites/snapcpp/contrib/serverplugins /home/alexis/snapwebsites/snapcpp/contrib/sitter /home/alexis/snapwebsites/snapcpp/contrib/snapcatch2 /home/alexis/snapwebsites/snapcpp/contrib/snapdev /home/alexis/snapwebsites/snapcpp/contrib/snaplogger ---------------- /home/alexis/snapwebsites/snapcpp/contrib/snaplogger Not Up to Date $ git status . HEAD detached at a10bbba nothing to commit, working tree clean $ git checkout main Previous HEAD position was a10bbba Added a test of the console adapter. Switched to branch 'main' Your branch is up to date with 'origin/main'. $ git pull Already up to date. /home/alexis/snapwebsites/snapcpp/contrib/snaprfs /home/alexis/snapwebsites/snapcpp/contrib/versiontheca ---------------- /home/alexis/snapwebsites/snapcpp/contrib/versiontheca Not Up to Date $ git status . HEAD detached at 1ac7a7a nothing to commit, working tree clean $ git checkout main Previous HEAD position was 1ac7a7a Cleaned up the doxy file further. Switched to branch 'main' Your branch is up to date with 'origin/main'. $ git pull Already up to date. /home/alexis/snapwebsites/snapcpp/contrib/zipios