Skip to content

Resolve syncing conflicts from FromPrivateRepo to live#9085

Merged
rwestMSFT merged 26 commits into
livefrom
FromPrivateRepo
Jun 19, 2023
Merged

Resolve syncing conflicts from FromPrivateRepo to live#9085
rwestMSFT merged 26 commits into
livefrom
FromPrivateRepo

Conversation

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

@learn-build-service-prod learn-build-service-prod Bot commented Jun 19, 2023

Pull request opened by Docs to resolve syncing conflicts from FromPrivateRepo to live.

suresh-kandoth and others added 25 commits June 2, 2023 16:27
@suresh-kandoth
Update bcp-utility.md
abfd249 
use console for Syntax section
remove href and use H4 for arguments
remove click references from Syntax section
@NathanMSFT
20230615 0943
6c9dc0c
@erinstellato-ms
Add Azure AD auth options
19dbb8f
@erinstellato-ms
update links and table
35d90a7
@erinstellato-ms
update links and table again
93fa461
@erinstellato-ms
fixed links
6afcb2b
@rwestMSFT
Update docs/ssms/quickstarts/ssms-connect-query-azure-sql.md
24c58e1
@erinstellato-ms
Update ssms-connect-query-azure-sql.md
2505bc0 
updated date
@KevinConanMSFT
20230619 Kevin Conan - tweaked create procedure and view to have corr…
ce83ab0 
…ect syntax for fabric
@erinstellato-ms
Update ssms-connect-query-azure-sql.md
52d9b2e 
adjusting breaks for table
@erinstellato-ms
Update ssms-connect-query-azure-sql.md
2b97ca5
@rwestMSFT
Refresh view-a-saved-trace article and address issue 7369
bb52803
@rwestMSFT
Acrolinx and address issue 9079
6e11671
@v-regandowner
Merge pull request #27463 from rwestMSFT/rw-0619-fix-7369
f1597c6 
Refresh view-a-saved-trace article and address issue 7369
@dimitri-furman
Clarify dynamic/auto scaling (azure-docs #111041)
78fc799
@prmerger-automator
Merge pull request #27467 from dimitri-furman/dfurman1
b9bb8b2 
Clarify dynamic/auto scaling (azure-docs #111041)
@prmerger-automator
Merge pull request #27417 from NathanMSFT/Hashbytes_20230615
2054193 
20230615 0943
@rwestMSFT
Update ssms-connect-query-azure-sql.md
b8e7f1a
@suresh-kandoth @PiJoCoder
Update docs/tools/bcp-utility.md
9737e25 
Co-authored-by: JosephPilov-MSFT <23519517+PiJoCoder@users.noreply.github.com>
@v-shils
Merge pull request #27466 from rwestMSFT/rw-0619-fix-9079
d8a6c56 
Acrolinx and address issue 9079
@prmerger-automator
Merge pull request #27462 from KevinConanMSFT/20230619-kecona
21cf45e 
20230619 Kevin Conan - tweaked create procedure and view to have corr…
@Stacyrch140
pencil edit
be074b1 
Lines 47 and 72: Azure Azure > Azure
@Stacyrch140
Merge pull request #27447 from erinstellato-ms/ssmsauthupdates
2d4ae68 
Add Azure AD auth options
@prmerger-automator
Merge pull request #27284 from suresh-kandoth/patch-25
7896ba7 
Update bcp-utility.md
@Taojunshen
Merge pull request #27470 from MicrosoftDocs/main
711fe5e 
6/19/2023 PM Publish
@prmerger-automator
Copy link
Copy Markdown
Contributor

prmerger-automator Bot commented Jun 19, 2023

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

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

learn-build-service-prod Bot commented Jun 19, 2023

Learn Build status updates of commit 711fe5e:

❌ 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 711fe5e0043af8d19147cde00ab16af09e325745 in branch FromPrivateRepo of repository https://github.com/MicrosoftDocs/sql-docs into branch live (commit 1d4634d86576f3d1544ddd00838491b13a2f1c2e). 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.

For any questions, please:

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

learn-build-service-prod Bot commented Jun 19, 2023

Learn Build status updates of commit 758c793:

✅ Validation status: passed

File Status Preview URL Details
azure-sql/database/scale-resources.md ✅Succeeded
docs/includes/ssnotedepfutureavoid-md.md ✅Succeeded
docs/relational-databases/polybase/polybase-pushdown-computation.md ✅Succeeded
docs/relational-databases/sql-trace/view-a-saved-trace-transact-sql.md ✅Succeeded
docs/sql-server/azure-arc/view-databases.md ✅Succeeded
docs/ssms/quickstarts/ssms-connect-query-azure-sql.md ✅Succeeded
docs/tools/bcp-utility.md ✅Succeeded
docs/t-sql/statements/create-procedure-transact-sql.md ✅Succeeded
docs/t-sql/statements/create-view-transact-sql.md ✅Succeeded

For more details, please refer to the build report.

For any questions, please:

@rwestMSFT rwestMSFT merged commit ef2669f into live Jun 19, 2023
@prmerger-automator
Copy link
Copy Markdown
Contributor

prmerger-automator Bot commented Jun 19, 2023

PR 9085 has been merged from MicrosoftDocs:FromPrivateRepo to MicrosoftDocs:live by rwestMSFT.

@suresh-kandoth, @NathanMSFT, @erinstellato-ms, @rwestMSFT, @KevinConanMSFT, @v-regandowner, @dimitri-furman, @v-shils, @Stacyrch140, @Taojunshen, @learn-build-service-prod

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

Change sent to author do-not-merge sql/svc tools-other/subsvc

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

10 participants

@rwestMSFT @suresh-kandoth @NathanMSFT @erinstellato-ms @KevinConanMSFT @v-regandowner @dimitri-furman @v-shils @Stacyrch140 @Taojunshen