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.

Sign up for GitHub

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

Jump to bottom

Remove some mergeconflict artifacts #2226

Merged
merged 2 commits into from
Dec 2, 2021
Merged

Remove some mergeconflict artifacts #2226

merged 2 commits into from
Dec 2, 2021

Conversation

jarsi
Copy link
Contributor

@jarsi jarsi commented Dec 1, 2021

This PR removes a couple of *.orig files. Judging from their file endings they appear to be merge artifacts.

Is it possible to have some kind of git hook or ci feature which automatically detects files with these endings and refuses to merge these?

@clinssen
Copy link
Contributor

clinssen commented Dec 1, 2021

Thanks for the PR! I would suggest adding *.orig to .gitignore.

@jougs
Copy link
Contributor

jougs commented Dec 2, 2021

I agree with @clinssen and will merge as soon as that's happened.

@jougs jougs self-requested a review December 2, 2021 08:36
@jougs jougs added I: No breaking change Previously written code will work as before, no one should note anything changing (aside the fix) S: Normal Handle this with default priority T: Maintenance Work to keep up the quality of the code and documentation. labels Dec 2, 2021
@jougs jougs added this to the NEST 3.2 milestone Dec 2, 2021
@jarsi
Copy link
Contributor Author

jarsi commented Dec 2, 2021

Thanks for your suggestions, it sounds very reasonable. I updated the .gitignore file.

@jougs jougs merged commit 31eb6de into nest:master Dec 2, 2021
@jarsi jarsi deleted the remove_mergeconflict_files branch December 2, 2021 08:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jougs jougs Awaiting requested review from jougs

Assignees
No one assigned
Labels
I: No breaking change Previously written code will work as before, no one should note anything changing (aside the fix) S: Normal Handle this with default priority T: Maintenance Work to keep up the quality of the code and documentation.
Projects
None yet
Milestone
NEST 3.2
Development

Successfully merging this pull request may close these issues.
3 participants
@jarsi @clinssen @jougs