Repository navigation
ci: reset the Toolforge checkout to main instead of pulling in deploy-db - #113
Merged
Merged
Conversation
The deploy-db run of #112 failed before importing anything: the bastion checkout had an untracked db/arabterm.sql.gz, which `git pull --ff-only` refuses to overwrite now that the file is tracked. The checkout is only a deploy mirror, so fetch and `git reset --hard origin/main`: a leftover file can no longer block the import. Ignored files (var/) are kept. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01P46G3NWFFqPMVwDmVo4vLJ
forzagreen
added a commit
that referenced
this pull request
Oct 18, 2026
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.
The
deploy-dbjob of #112 (run 37600073380) failed before importing anything:The bastion checkout (
~/wikitermbase) had an untrackeddb/arabterm.sql.gz, probably left by an earlier manual download. Now that #112 tracks that file,git pull --ff-onlyrefuses to overwrite it.Change
deploy-dbnow runsgit fetch origin main+git reset --hard origin/maininstead ofgit pull --ff-only. That checkout is only a deploy mirror, so it should matchmainexactly; a leftover file can no longer block the import. Ignored files (var/) are kept.CLAUDE.mdupdated to match.Reproduced locally: a clone at 878817c with a stray
db/arabterm.sql.gzfailsgit merge --ff-only ec83e77with the same error, andgit reset --hard ec83e77succeeds,gzip -tpasses,var/local.cnfis kept.Notes
reset --hardalso discards hand edits to tracked files in the bastion checkout, if any were made deliberately.deploy-db(the dump is unchanged); the bastion checkout gets synced on the next data refresh.🤖 Generated with Claude Code
https://claude.ai/code/session_01P46G3NWFFqPMVwDmVo4vLJ
Generated by Claude Code