Skip to content

Update Set-CsTeamsMeetingPolicy.md #11689

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

Closed
wants to merge 1 commit into from

Conversation

NancyForero
Copy link
Contributor

adding attribute to policy with description to enable third party API

adding attribute to policy with description to enable third party API
Copy link

Learn Build status updates of commit f1895ee:

❌ 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 f1895ee9b4f772d782aaa07a9a084c07dfc3ac5d in branch patch-1 of repository https://github.com/NancyForero/office-docs-powershell into branch main (commit 01bbe6cdf21e384142108c8ffe54b1b4b0151b91). 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:

@NancyForero
Copy link
Contributor Author

@tomkau i have been reading the documentation for a week. i do not understand how to solve the conflict. could you help solve it and teach me how to solve conflicts in the future? thank you.

chrisda added a commit that referenced this pull request Apr 19, 2024
Massive structural reorganization and addition of changes from #11689
@chrisda
Copy link
Contributor

chrisda commented Apr 22, 2024

Closing as changes are already in article.

@chrisda chrisda closed this Apr 22, 2024
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.

4 participants