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

Clean-up a few files following the merge #173

Merged
merged 2 commits into from
Jan 17, 2022
Merged

Conversation

kachkaev
Copy link
Contributor

@kachkaev kachkaev commented Jan 17, 2022

🌟 What is the purpose of this PR?

This PR follows #172. It tweaks a few files which had merge conflicts. When I was doing a test merge on Friday, I carefully went through the conflicting files to make sure important things were not lost. However, when I was working on the final merge today, I somehow forgot to include the ‘correct’ versions. There is nothing major, but the tweaks might be still worth it.

⚠️ Known issues

  • Our ignorefiles include rules for both repos and might need a cleanup at some point.
  • Some labels don’t apply because we don’t have them configured in this repo. This should be done via the GitHub UI. However, maybe we should rethink them first?

🔗 Related links

@github-actions github-actions bot added area/infra Relates to version control, CI, CD or IaC (area) area/deps Relates to third-party dependencies (area) labels Jan 17, 2022
@kachkaev kachkaev marked this pull request as ready for review January 17, 2022 18:43
@kachkaev kachkaev merged commit 5d71197 into main Jan 17, 2022
@kachkaev kachkaev deleted the ak/cleanup-a-few-files branch January 17, 2022 19:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/deps Relates to third-party dependencies (area) area/infra Relates to version control, CI, CD or IaC (area)
Development

Successfully merging this pull request may close these issues.

2 participants