chore: remove stray git-stash leftovers, fix .gitignore conflict markers (fixes #1030)#1178
Merged
Conversation
…ers (fixes #1030) Remove NOW.md~Stashed changes{,_0,_1} that break check-now-freshness CI gate; resolve leftover git-stash conflict markers in .gitignore and add *~Stashed changes* ignore pattern.
Contributor
|
📓 NotebookLM Notebook linked to this PR
This notebook contains session context, decisions, and artifacts for this work. |
Contributor
Contributor
PR DashboardGenerated at: 2026-06-16 12:33:34 UTC
Summary
Seal Status
|
Contributor
|
📓 NotebookLM Notebook linked to this PR
This notebook contains session context, decisions, and artifacts for this work. |
Contributor
PR DashboardGenerated at: 2026-06-16 12:35:14 UTC
Summary
Seal Status
|
Contributor
|
📓 NotebookLM Notebook linked to this PR
This notebook contains session context, decisions, and artifacts for this work. |
This was referenced Jun 16, 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
1 participant
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.
Изменения
git stash:NOW.md~Stashed changesNOW.md~Stashed changes_0NOW.md~Stashed changes_1.gitignore:<<<<<<< Updated upstream,=======,>>>>>>> Stashed changes(строки 49/53/61), сохранив контент обеих сторон;*~Stashed changes*, чтобы такие файлы больше не попадали в индекс.Почему
Файлы
NOW.md~Stashed changes*ломают CI-гейт свежести (check-now-freshness.yml) и засоряют корень. Маркеры конфликта в.gitignoreделают сам ignore-файл некорректным. Это блокер P0 (WV-01).Проверка
git ls-files | grep "Stashed"→ пусто.grep -nE "<<<<<<<|=======|>>>>>>>" .gitignore→ пусто.Closes
#1030