Skip to content

Use relative links instead of $docs syntax (backport #3291) #3309

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

Merged
merged 4 commits into from
Mar 7, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 7, 2022

This is an automatic backport of pull request #3291 done by Mergify.
Cherry-pick of 1b80b21 has failed:

On branch mergify/bp/release/3.1.x/pr-3291
Your branch is up to date with 'origin/release/3.1.x'.

You are currently cherry-picking commit 1b80b21358.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   docs/changehistory/1.10.0.md
	modified:   docs/changehistory/1.5.0.md
	modified:   docs/changehistory/1.8.0.md
	modified:   docs/changehistory/2.12.0.md
	modified:   docs/changehistory/2.13.0.md
	modified:   docs/changehistory/2.15.0.md
	modified:   docs/changehistory/2.16.0.md
	modified:   docs/changehistory/2.17.0.md
	modified:   docs/changehistory/3.0.0.md
	modified:   docs/changehistory/index.md
	modified:   docs/getting-started/leftNav.md
	modified:   docs/getting-started/offline-quickstart.md
	modified:   docs/getting-started/online-quickstart.md
	modified:   docs/learning/Glossary.md
	modified:   docs/learning/backend/AccessingIModels.md
	modified:   docs/learning/backend/ConcurrencyControl.md
	modified:   docs/learning/backend/SchemasAndElementsInTypeScript.md
	modified:   docs/learning/faq.md
	modified:   docs/learning/frontend/Views.md
	modified:   docs/learning/iModelHub/Events.md
	modified:   docs/learning/iModelHub/Permissions.md
	modified:   docs/learning/iModelHub/iModels/CreateiModel.md
	modified:   docs/learning/iModelHub/iModels/index.md
	modified:   docs/learning/leftNav.md
	modified:   docs/learning/tutorials/create-test-imodel-itwin-sync.md
	modified:   docs/learning/tutorials/create-test-imodel-offline.md
	modified:   docs/learning/tutorials/create-test-imodel-sample.md
	modified:   docs/learning/tutorials/develop-agent.md
	modified:   docs/learning/tutorials/develop-desktop-viewer.md
	modified:   docs/learning/tutorials/develop-web-viewer.md
	modified:   docs/learning/tutorials/explore-imodel-console.md
	modified:   docs/learning/tutorials/explore-schema-browser.md
	modified:   docs/learning/tutorials/index.md
	modified:   docs/learning/tutorials/itwin-snapshot-app.md
	modified:   docs/learning/tutorials/registering-applications.md
	modified:   docs/learning/tutorials/use-existing-imodel.md
	modified:   docs/learning/ui/appui-react/ChildWindows.md
	modified:   docs/presentation/Motivation/index.md

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   docs/changehistory/2.11.0.md
	both modified:   docs/changehistory/NextVersion.md

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* Use relative links instead of $docs syntax

* Fix bad merge

(cherry picked from commit 1b80b21)

# Conflicts:
#	docs/changehistory/2.11.0.md
#	docs/changehistory/NextVersion.md
@calebmshafer calebmshafer enabled auto-merge (squash) March 7, 2022 20:33
@calebmshafer calebmshafer disabled auto-merge March 7, 2022 22:16
@calebmshafer calebmshafer merged commit e598b93 into release/3.1.x Mar 7, 2022
@calebmshafer calebmshafer deleted the mergify/bp/release/3.1.x/pr-3291 branch March 7, 2022 22:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants