search

MicrosoftDocs / microsoft-cloud

Public sync for private microsoft-cloud-pr repo
MIT License
4 stars 6 forks source link

Resolve syncing conflicts from repo_sync_working_branch to main #6

Closed learn-build-service-prod[bot] closed 1 year ago

learn-build-service-prod[bot] commented 1 year ago

Pull request opened by Docs to resolve syncing conflicts from repo_sync_working_branch to main.

ShannonLeavitt commented 1 year ago

@BryanLa - This sync PR has been open for several days, and the repo shows no history of who usually merges PRs like this. Please advise. In the future, the PR review team can review and merge this sort of PR without your review if you authorize.

BryanLa commented 1 year ago

@BryanLa Bryan Lamos FTE - This sync PR has been open for several days, and the repo shows no history of who usually merges PRs like this. Please advise. In the future, the PR review team can review and merge this sort of PR without your review if you authorize.

@ShannonLeavitt - thanks very much for checking on this! I'm pretty sure this was caused by the fact that the service account that does repo syncing from private-to-public was not authorized (in the protected branch settings). I've added this so we should be good going forward. And yes, please do feel free to review/merge these whenever you see them. I believe our pubdesk team also checks for these and merges them (@huypub can correct me if I'm wrong) . The only time you'll need to involve us is if there is a merge conflict.

cc: @DanWahlin @JasRobe