[ehb54/ultrascan3] 7d2452: somo: untrack revision.sh and moc artifacts commit...
Branch: refs/heads/ehb54-issue-984 Home: https://github.com/ehb54/ultrascan3 Commit: 7d245291648635d6ac78b2781985c39d165d406a https://github.com/ehb54/ultrascan3/commit/7d245291648635d6ac78b2781985c39d1... Author: ehb54 <brookes@uthscsa.edu> Date: 2026-08-07 (Fri, 07 Aug 2026) Changed paths: R us_somo/develop/revision.sh R us_somo/develop/us_saxs_cmds_t/moc_predefs.h R us_somo/develop/us_saxs_cmds_t/moc_us_cmdline_app.cpp Log Message: ----------- somo: untrack revision.sh and moc artifacts committed by mistake The previous commit staged with `git add -A us_somo`, which swept in three files that were untracked for good reason: - us_somo/develop/revision.sh -- somo-dev deliberately removed this from the tree; each clone supplies its own untracked copy, and qmake runs it as a FORCE target on every build. Tracking it both reverses that decision and makes every build dirty the working tree. - us_saxs_cmds_t/moc_predefs.h, moc_us_cmdline_app.cpp -- moc output, i.e. build artifacts. Tracking them also broke `git pull` for anyone holding their own copies: "untracked working tree files would be overwritten by merge". Removed from the index only; the local files are untouched. Anyone whose pull was blocked can now pull cleanly -- the net change across the two commits does not touch these paths, so their local copies are left alone. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> To unsubscribe from these emails, change your notification settings at https://github.com/ehb54/ultrascan3/settings/notifications
participants (1)
-
emre brookes