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

pulling updated ignore file from master to address merge conflicts #284

Merged
merged 1 commit into from
Oct 7, 2019
Merged

pulling updated ignore file from master to address merge conflicts #284

merged 1 commit into from
Oct 7, 2019

Conversation

frodopwns
Copy link
Contributor

Master branch now ignores generated files to reduce merge conflicts from generated files. This is due to reordering of generated files. These files will now be generated during the build process.

Copy link
Contributor

@WilliamMortlMicrosoft WilliamMortlMicrosoft left a comment

Choose a reason for hiding this comment

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

Thank you!

@frodopwns frodopwns merged commit f28ead4 into Azure:azure-sql Oct 7, 2019
Porges pushed a commit that referenced this pull request May 11, 2021
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