GV

GeezerVison

The World Wide Web, restored to 800 pixels of glory.

Home|About|Gaming cabinet|Archives|How it works|Starter sites

On this site

  • Sign in
  • ActionsCI/CD and automation
  • CodespacesCloud development environments
  • All Features
  • Documentation
  • Training
  • Certifications
  • Build with Copilot
  • Customize Copilot
  • Integrations
  • Trending repos
  • GitHub Sponsors
  • Developer articles
  • Enterprises

This view

  • Original page
  • New address

GeezerVison is showing github.com — avoid duplicate files in --all-files during conflict by asottile · Pull Request #3727 · pre-commit/pre-commit

Conversation

@asottile

@asottile asottile commented Jul 21, 2026 •
edited
Loading

Uh oh!

There was an error while loading. Please reload this page.

Copy link
Copy Markdown
Member

resolves #3706

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
All reactions
@asottile
avoid duplicate files in --all-files during conflict
8a1c47a
@asottile
asottile enabled auto-merge July 21, 2026 20:35
@asottile
asottile merged commit 766e550 into main Jul 21, 2026
28 checks passed

Uh oh!

There was an error while loading. Please reload this page.
@asottile
asottile deleted the dedupe branch July 21, 2026 20:44
@albertferras-vrf

albertferras-vrf commented Jul 22, 2026 •
edited
Loading

Uh oh!

There was an error while loading. Please reload this page.

Copy link
Copy Markdown

@asottile this change broke some of our CI pipelines running pre-commit because we were using git version 2.30.2 (--deduplicate was added on 2.31.0).
We will update our git binary, but wondering if pre-commit should also check for minimum git command version or if this --deduplicate tag should only be added after checking git version first. I couldn't find anywhere in the documentation which is the minimum git binary that should be instaleld
bmureseanu reacted with thumbs up emoji
All reactions
  • 👍 1 reaction

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
@asottile

asottile commented Jul 22, 2026

Copy link
Copy Markdown
Member Author

2.31 is 5 years old
All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
@pre-commit pre-commit locked as resolved and limited conversation to collaborators Jul 22, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

No reviews

Uh oh!

There was an error while loading. Please reload this page.

Assignees

No one assigned

Labels

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Duplicate files when doing pre-commit run --all-files during git conflict

Uh oh!

There was an error while loading. Please reload this page.

2 participants

@asottile @albertferras-vrf
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.
You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.