Title: Duplicate files when doing `pre-commit run --all-files` during git conflict · Issue #3706 · pre-commit/pre-commit · GitHub
Open Graph Title: Duplicate files when doing `pre-commit run --all-files` during git conflict · Issue #3706 · pre-commit/pre-commit
X Title: Duplicate files when doing `pre-commit run --all-files` during git conflict · Issue #3706 · pre-commit/pre-commit
Description: search you tried in the issue tracker merge / conflict / duplicate describe your issue Hello, First of all, thank you for your work. The tool helps to organize development workflows a lot. Here is an issue I have encountered: I'm using p...
Open Graph Description: search you tried in the issue tracker merge / conflict / duplicate describe your issue Hello, First of all, thank you for your work. The tool helps to organize development workflows a lot. Here is ...
X Description: search you tried in the issue tracker merge / conflict / duplicate describe your issue Hello, First of all, thank you for your work. The tool helps to organize development workflows a lot. Here is ...
Opengraph URL: https://github.com/pre-commit/pre-commit/issues/3706
X: @github
Domain: github.com
{"@context":"https://schema.org","@type":"DiscussionForumPosting","headline":"Duplicate files when doing `pre-commit run --all-files` during git conflict","articleBody":"### search you tried in the issue tracker\n\nmerge / conflict / duplicate\n\n### describe your issue\n\nHello,\n\nFirst of all, thank you for your work. The tool helps to organize development workflows a lot. Here is an issue I have encountered:\n\nI'm using `pre-commit` manually to run lints and checks over my code during development workflow. In particular running it during rebases when conflicts arisen. I found `pre-commit` to duplicate file names if they are in conflicted state. Some tools misbehaves in case.\n\nHere is a minimal reproducible scenario using git stash conflict:\n\n```sh\n$ git init .\n$ touch README.md\n$ git add README.md \n$ git commit -am \"initial state\"\n[master (root-commit) 53eaf48] initial state\n 1 file changed, 0 insertions(+), 0 deletions(-)\n create mode 100644 README.md\n$ pre-commit run --all-files --verbose\necho.....................................................................Passed\n- hook id: echo\n- duration: 0s\n\nREADME.md\n\n$ echo 'right' > ./README.md \n$ git stash\nSaved working directory and index state WIP on master: 53eaf48 initial state\n$ echo 'left' > ./README.md \n$ git add README.md \n$ git stash pop\nAuto-merging README.md\nCONFLICT (content): Merge conflict in README.md\nRecorded preimage for 'README.md'\nOn branch master\nUnmerged paths:\n (use \"git restore --staged \u003cfile>...\" to unstage)\n (use \"git add \u003cfile>...\" to mark resolution)\n\tboth modified: README.md\n\nUntracked files:\n (use \"git add \u003cfile>...\" to include in what will be committed)\n\t.pre-commit-config.yaml\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\nThe stash entry is kept in case you need it again.\n$ pre-commit run --all-files --verbose\necho.....................................................................Passed\n- hook id: echo\n- duration: 0s\n\nREADME.md README.md README.md\n```\n\nIt would be nice if `pre-commit` could de-duplicate file list prior to feeding it to tools being invoked. Workarounds are welcome.\n\n\n### pre-commit --version\n\npre-commit 4.6.0\n\n### .pre-commit-config.yaml\n\n```yaml\nrepos:\n - repo: local\n hooks:\n - id: echo\n name: echo\n entry: echo\n language: system\n```\n\n### ~/.cache/pre-commit/pre-commit.log (if present)\n\n-","author":{"url":"https://github.com/RomanValov","@type":"Person","name":"RomanValov"},"datePublished":"2026-06-08T13:11:28Z","url":"https://github.com/pre-commit/pre-commit/issues/3706"}
| react-profiling | 0 |
| react-import-map | react,react-dom,react-dom/client,react-dom/profiling,react-is,react/compiler-runtime,react/jsx-dev-runtime,react/jsx-runtime,scheduler@b8488ee2c322 |
| route-pattern | /_view_fragments/issues/show/:user_id/:repository/:id/issue_layout(.:format) |
| route-controller | voltron_issues_fragments |
| route-action | issue_layout |
| fetch-nonce | v2:7e7a7533-0b58-355c-9d3c-baf758d7ed67 |
| current-catalog-service-hash | 81bb79d38c15960b92d99bca9288a9108c7a47b18f2423d0f6438c5b7bcd2114 |
| request-id | 8C6C:172B92:3439BFC:45946C9:6B01FE9B |
| html-safe-nonce | 97730849d28af74b8173c091a19bc3f567c2a8c3826611380925407570a93525 |
| visitor-payload | eyJyZWZlcnJlciI6IiIsInJlcXVlc3RfaWQiOiI4QzZDOjE3MkI5MjozNDM5QkZDOjQ1OTQ2Qzk6NkIwMUZFOUIiLCJ2aXNpdG9yX2lkIjoiNjc3ODM1NDM4NDE2ODU0NjgzIiwicmVnaW9uX2VkZ2UiOiJpYWQiLCJyZWdpb25fcmVuZGVyIjoiaWFkIn0= |
| visitor-hmac | a88c4f9d09345a82d27c62b3b1d8b48aa4ba6a6b225b62497d6fa4f44083b94e |
| hovercard-subject-tag | issue:4613167749 |
| github-keyboard-shortcuts | repository,issues,commits,copilot |
| google-site-verification | Apib7-x98H0j5cPqHWwSMm6dNU4GmODRoqxLiDzdx9I |
| octolytics-url | https://collector.github.com/github/collect |
| analytics-location | / |
| fb:app_id | 1401488693436528 |
| apple-itunes-app | app-id=1477376905, app-argument=https://github.com/_view_fragments/issues/show/pre-commit/pre-commit/3706/issue_layout |
| twitter:image | https://opengraph.githubassets.com/cde05a83376e5f7a4e261fbceca1144b2b838e964be1951abf23569c9fce7ba1/pre-commit/pre-commit/issues/3706 |
| twitter:card | summary_large_image |
| og:image | https://opengraph.githubassets.com/cde05a83376e5f7a4e261fbceca1144b2b838e964be1951abf23569c9fce7ba1/pre-commit/pre-commit/issues/3706 |
| og:image:alt | search you tried in the issue tracker merge / conflict / duplicate describe your issue Hello, First of all, thank you for your work. The tool helps to organize development workflows a lot. Here is ... |
| og:image:width | 1200 |
| og:image:height | 600 |
| og:site_name | GitHub |
| og:type | object |
| og:author:username | RomanValov |
| hostname | github.com |
| expected-hostname | github.com |
| None | 87e774ee7c6b3bee0490394e4d3e57ec9dbc956f74b87ea685dc8996c1676456 |
| turbo-cache-control | no-preview |
| go-import | github.com/pre-commit/pre-commit git https://github.com/pre-commit/pre-commit.git |
| octolytics-dimension-user_id | 6943086 |
| octolytics-dimension-user_login | pre-commit |
| octolytics-dimension-repository_id | 17689377 |
| octolytics-dimension-repository_nwo | pre-commit/pre-commit |
| octolytics-dimension-repository_public | true |
| octolytics-dimension-repository_is_fork | false |
| octolytics-dimension-repository_network_root_id | 17689377 |
| octolytics-dimension-repository_network_root_nwo | pre-commit/pre-commit |
| turbo-body-classes | logged-out env-production page-responsive |
| disable-turbo | false |
| browser-stats-url | https://api.github.com/_private/browser/stats |
| browser-errors-url | https://api.github.com/_private/browser/errors |
| release | 423dbb54c5e7bfecc838eb387c1435eb3d0e760d |
| ui-target | full |
| theme-color | #1e2327 |
| color-scheme | light dark |
| react-app-name | issues |
Links:
Viewport: width=device-width