Skip to content
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

Ignore .orig files #1095

Merged
merged 2 commits into from
Oct 24, 2023
Merged

Ignore .orig files #1095

merged 2 commits into from
Oct 24, 2023

Conversation

anniel-stripe
Copy link
Contributor

To prevent files like in #1094 from accidentally getting committed (we should also make sure this setting is false locally git config --global mergetool.keepBackup false).

@anniel-stripe anniel-stripe requested review from a team and pakrym-stripe and removed request for a team October 24, 2023 17:32
@richardm-stripe
Copy link
Contributor

My bad!

@anniel-stripe anniel-stripe enabled auto-merge (squash) October 24, 2023 17:33
@anniel-stripe anniel-stripe merged commit 0c994c2 into master Oct 24, 2023
10 checks passed
@xavdid-stripe xavdid-stripe deleted the anniel-ignore-orig branch May 10, 2024 03:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants