Add repo validation workflow, conflict-fixer script, and UI/config improvements#9
Merged
Merged
Conversation
💡 Codex ReviewThe validation script currently limits conflict-marker scanning to ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
If Codex has suggestions, it will comment; otherwise it will react with 👍. Codex can also answer questions or update the PR. Try commenting "@codex address that feedback". |
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.
Motivation
IndentationErrorand similar issues.Description
/.github/workflows/validate.ymlthat runspython scripts/validate_repo.pyon pull requests and pushes tomain.scripts/validate_repo.pywhich scansmain.pyandsrc/*.pyfor conflict markers and branch artefacts and runscompileallonmain.pyandsrc.scripts/fix_conflict_artifacts.pywhich can sanitize files by removing conflict tokens and common branch artefacts and creates a.bakbackup when run with--write.src/app.pyto migrate config to a per-user folder (~/.duplicate-file-cleaner/config.json), add robust JSON read/write helpers, and fallback to legacyconfig.json; also improve UI layout (splitters), add a toggleable filters panel, numeric sorting viaSortableTreeWidgetItem, group expand/collapse actions, and selection-load guard (_selection_loaded).README.mdwith a quick resolution section describing how to use the conflict-fixer script, update.gitignoreto includeconfig.json, and replace the rootconfig.jsoncontent with{}; remove several stray placeholder files.Testing
python scripts/validate_repo.pylocally which checks for conflict markers and attempts to compilemain.pyandsrc, and it completed successfully.validate.ymlto run the same validation on PRs and pushes tomain, ensuring automated checks will run for future changes.Codex Task