Skip to content

Resolve syncing conflicts from repo_sync_working_branch to main #310

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.

Sign up for GitHub

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

Jump to bottom
Open
wants to merge 206 commits into
base: main
Choose a base branch
from
Open

Resolve syncing conflicts from repo_sync_working_branch to main #310

wants to merge 206 commits into from

Conversation

@learn-build-service-prod
Copy link
Contributor

@learn-build-service-prod learn-build-service-prod bot commented Jun 30, 2025

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

markwahl-msft and others added 30 commits October 16, 2024 16:48
@markwahl-msft
remove mfaserver from toc
849439b
@markwahl-msft
remove PAM MFA article too
c98b6f6
@markwahl-msft
acorlinx spaces
60e04a8
@markwahl-msft
update article name for PAM to custom
fefc3d6
@markwahl-msft
acrolinx
a26db14
Merge pull request #919 from markwahl-msft/mwahl-remove-mfa-server-toc
c0f5769 
Azure MFA Server deprecation: remove mfaserver article from toc, change PAM article to custom
@Emma-yxf
Merge pull request #920 from MicrosoftDocs/main
59f0db7 
10/17/2024 AM Publish
@billmath
staging
39ac4f1
@billmath
Merge pull request #921 from billmath/sfifixes
7d4a662 
staging
@billmath
staging
8711170
@billmath
Merge pull request #922 from billmath/sfifixes
067610e 
staging
@Emma-yxf
Merge pull request #924 from MicrosoftDocs/main
88ac797 
10/21/2024 AM Publish
@meganbradley
status
5bf17a6
@billmath
updating
8c21f5f
@billmath
staging
7b9a845
@billmath
staging
8ad5425
@billmath
updating
0c4fcf4
@billmath
updating
2ce3e16
@billmath
updating
0dcb31b
@billmath
updating
68e909b
@billmath
updating
8b4015b
@billmath
updating
e54d459
@billmath
updating
61e6ae9
@billmath
updating
6c5ff2b
@billmath
updating
6151713
@billmath
updating
a7d9cb6
@v-dirichards
Merge pull request #925 from meganbradley/meganbradley/docutune-autop…
4cf1c46 
…r-20241021-231932-1418895-ignore-build

[BULK] - DocuTune remediation - Sensitive terms with GUIDs
@Emma-yxf
Merge pull request #928 from MicrosoftDocs/main
143c189 
10/30/2024 PM Publish
@billmath
Merge branch 'main' of https://github.com/MicrosoftDocs/MIMDocs-pr in…
d7b916a 
…to azmon1
@billmath
updating
8974d88
henrymbuguakiarie and others added 30 commits October 8, 2025 09:42
@henrymbuguakiarie
Fixing the numbering
d8e1771
@henrymbuguakiarie
Fixing image filenaming
250b1ed
@henrymbuguakiarie
Adding terms image
a641335
@henrymbuguakiarie
Adding clarity
afac36c
@henrymbuguakiarie
Adding clarity
a43e3f6
@henrymbuguakiarie
Adding clarity
97836d1
@henrymbuguakiarie
Adding clarity and firewall image
e0ec7a4
@henrymbuguakiarie
bugfix
c884c0f
@v-ccolin
Merge pull request #990 from Dickson-Mwendia/MIM-SP3-release
ccdd6d3 
MIM Service Pack 3 release content - (Feature improvements, deprecations, ADFS Integration)
@Stacyrch140
Merge pull request #989 from henrymbuguakiarie/update-mim-sp3-support…
4917c91 
…ed-platforms

MIM 2016 SP3 release - Updating existing docs
@billmath
updating author
5417964
@billmath
updating author
bd334e4
@billmath
Merge pull request #1019 from billmath/auth1
ecd39f4 
updating author
@learn-build-service-prod
Merge pull request #1020 from MicrosoftDocs/main
3dc755d 
Auto Publish – main to live - 2025-10-31 17:30 UTC
@Dickson-Mwendia
Update MIM Version history doc
b1f5ece
@ttorble
Update version-history.md
75a1bb1
@ttorble
Merge pull request #1021 from Dickson-Mwendia/mim-version-history
83e0a84 
Update MIM Version history doc
@henrymbuguakiarie
Revert "Update MIM Version history doc"
5c61111
@learn-build-service-prod
Merge pull request #1022 from MicrosoftDocs/main
7f65bd1 
Auto Publish – main to live - 2025-11-04 18:30 UTC
@henrymbuguakiarie
Merge pull request #1023 from MicrosoftDocs/revert-1021-mim-version-h…
27c6f61 
…istory

Revert "Update MIM Version history doc"
@henrymbuguakiarie
Revert "Merge pull request #989 from henrymbuguakiarie/update-mim-sp3…
ec8b457 
…-supported-platforms"

This reverts commit 4917c91, reversing
changes made to ccdd6d3.
@henrymbuguakiarie
update the date
e5b9991
@v-ccolin
Apply suggestions from code review
c6b7174
@v-ccolin
Merge pull request #1024 from henrymbuguakiarie/revert-update-mim-sp3…
0ef795d 
…-supported-platforms

Rollback MIM SP3 docs changes due to GA delay
@henrymbuguakiarie
Revert "Merge pull request #990 from Dickson-Mwendia/MIM-SP3-release"
ccb32fb 
This reverts commit ccdd6d3, reversing
changes made to a98ff8b.
@henrymbuguakiarie
Adding redirection
9fb7d0f
@henrymbuguakiarie
Adding redirection
cb56ac3
@henrymbuguakiarie
Adding redirection
8444e5d
@Stacyrch140
Merge pull request #1025 from henrymbuguakiarie/main
9529371 
Revert "Merge pull request #990 from Dickson-Mwendia/MIM-SP3-release"
@learn-build-service-prod
Merge pull request #1026 from MicrosoftDocs/main
6c19a39 
Auto Publish – main to live - 2025-11-05 18:30 UTC
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@billmath billmath Awaiting requested review from billmath

Assignees

@billmath billmath

Labels

aq-pr-triaged Tracking label for the PR review team do-not-merge

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.