Skip to content

feat: ✨ pre-commit hook to check for conflicts #102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 24, 2025

Conversation

lwjohnst86
Copy link
Member

Description

These changes add a hook to check for conflicts. This is most useful when updating the data package from the template.

Closes #96

This PR needs a quick review.

Checklist

  • Ran just run-all

@lwjohnst86 lwjohnst86 requested a review from a team as a code owner July 24, 2025 11:53
@lwjohnst86 lwjohnst86 moved this from Todo to In Review in Iteration planning Jul 24, 2025
Copy link
Member

@signekb signekb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oooo

@github-project-automation github-project-automation bot moved this from In Review to In Progress in Iteration planning Jul 24, 2025
@lwjohnst86 lwjohnst86 merged commit 39ba9a5 into main Jul 24, 2025
6 checks passed
@lwjohnst86 lwjohnst86 deleted the feat/precommit-hook-to-check-for-conflicts branch July 24, 2025 13:31
@github-project-automation github-project-automation bot moved this from In Progress to Done in Iteration planning Jul 24, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

Add pre-commit hooks to not commit conflicts after copier update
2 participants