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

Sync eng/common directory with azure-sdk-tools for PR 870 #392

Merged
merged 1 commit into from
Aug 20, 2020

Conversation

azure-sdk
Copy link
Collaborator

Sync eng/common directory with azure-sdk-tools for PR 870

@azure-sdk azure-sdk force-pushed the sync-eng-common-pr_temp_link-870 branch 2 times, most recently from 52357f0 to c75cfbd Compare August 19, 2020 17:01
@@ -10,14 +10,3 @@ Any updates to files in the `eng/common` directory should be made in the [azure-
All changes made will cause a PR to created in all subscribed azure-sdk language repos which will blindly replace all contents of
the `eng/common` directory in that repo. For that reason do **NOT** make changes to files in this directory in the individual azure-sdk
languages repos as they will be overwritten the next time an update is taken from the common azure-sdk-tools repo.
Copy link
Member

Choose a reason for hiding this comment

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

@chidozieononiwu this doesn't look correct. Can you try to understand why it looks like it is removing these things you recently added?

Copy link
Member

Choose a reason for hiding this comment

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

I suspect it might have to do with the fact that @sima-zhu hasn't merged with your latest tools changes. We need to figure out a good way to make sure we don't accidently undo changes in this way.

Copy link
Member

Choose a reason for hiding this comment

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

It seems that @sima-zhu changes occurred somewhere while I was working on it. Please @sima-zhu can you rebase the Tools PR and push the changes, that should fix all the Sync PRs.

Copy link
Contributor

Choose a reason for hiding this comment

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

I have merged the conflicts. It disappeared now.
@chidozieononiwu Could you check the diff? I will merge the change once you approved.

@azure-sdk azure-sdk force-pushed the sync-eng-common-pr_temp_link-870 branch from acfe4e6 to 6ace655 Compare August 20, 2020 00:23
@azure-sdk azure-sdk force-pushed the sync-eng-common-pr_temp_link-870 branch from 6ace655 to 846858b Compare August 20, 2020 00:45
@sima-zhu sima-zhu merged commit 72f47c7 into Azure:master Aug 20, 2020
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.

4 participants