Skip to content

Resolve syncing conflicts from repo_sync_working_branch to main#423

Merged
Court72 merged 6 commits into
mainfrom
repo_sync_working_branch
Jun 4, 2026
Merged

Resolve syncing conflicts from repo_sync_working_branch to main#423
Court72 merged 6 commits into
mainfrom
repo_sync_working_branch

Conversation

@learn-build-service-prod
Copy link
Copy Markdown
Contributor

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

whhender and others added 5 commits May 28, 2026 14:34
Co-authored-by: Whitney Henderson <13474870+whhender@users.noreply.github.com>
Power Query M: May 2026 CY update - type definition formatting
Auto Publish – main to live - 2026-06-03 22:06 UTC
@prmerger-automator
Copy link
Copy Markdown
Contributor

@learn-build-service-prod[bot] : Thanks for your contribution! The author(s) and reviewer(s) have been notified to review your proposed change.

@learn-build-service-prod
Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit e63c482:

❌ Validation status: errors

Please follow instructions here which may help to resolve issue.

File Status Preview URL Details
❌Error Details

  • [Error: CannotMergeCommit] Cannot merge commit e63c48223c755e54fbc905dde17ea3b8fa2aeaaa in branch repo_sync_working_branch of repository https://github.com/MicrosoftDocs/query-docs into branch main (commit 9c6145e2caf868d6819ff949d3867beb1fdb3bf3). Please follow this documentation: https://help.github.com/articles/resolving-a-merge-conflict-using-the-command-line/ to use git.exe to resolve you content conflicts locally and then push to remote.

For more details, please refer to the build report.

Note: Your PR may contain errors or warnings or suggestions unrelated to the files you changed. This happens when external dependencies like GitHub alias, Microsoft alias, cross repo links are updated. Please use these instructions to resolve them.

@learn-build-service-prod
Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit 3f04876:

✅ Validation status: passed

File Status Preview URL Details
query-languages/m/time-hour.md ✅Succeeded
query-languages/m/time-minute.md ✅Succeeded

For more details, please refer to the build report.

@Court72 Court72 merged commit 89339a8 into main Jun 4, 2026
2 checks passed
@Court72 Court72 deleted the repo_sync_working_branch branch June 4, 2026 15:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants