Skip to content

v0.34.x: Removing all the vuepress related build files and references (backport #253)#264

Merged
andynog merged 5 commits intov0.34.xfrom
mergify/bp/v0.34.x/pr-253
Feb 9, 2023
Merged

v0.34.x: Removing all the vuepress related build files and references (backport #253)#264
andynog merged 5 commits intov0.34.xfrom
mergify/bp/v0.34.x/pr-253

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Feb 2, 2023

This is an automatic backport of pull request #253 done by Mergify.
Cherry-pick of d159562 has failed:

On branch mergify/bp/v0.34.x/pr-253
Your branch is up to date with 'origin/v0.34.x'.

You are currently cherry-picking commit d159562d0.
  (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:
	deleted:    docs/.textlintrc.json
	deleted:    docs/.vuepress/styles/index.styl
	deleted:    docs/package-lock.json
	deleted:    docs/post.sh
	deleted:    docs/pre.sh
	deleted:    docs/stop-words.txt

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   Makefile
	deleted by us:   RELEASES.md
	deleted by them: docs/.vuepress/config.js
	deleted by them: docs/.vuepress/redirects
	both modified:   docs/DOCS_README.md
	deleted by us:   docs/architecture/README.md
	deleted by them: docs/package.json
	deleted by them: docs/versions

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

* Removing all the vuepress related build files and references (#249)

* Moved documentation ADR to deprecated (#249)

* Reverting the logic for check-docs-toc until ADR/RFC refactor (#249)

* Setting the right permissions to file so workflow executes (#249)

* Reverting ADR change, will do in another issue (#249)

(cherry picked from commit d159562)

# Conflicts:
#	Makefile
#	RELEASES.md
#	docs/.vuepress/config.js
#	docs/.vuepress/redirects
#	docs/DOCS_README.md
#	docs/architecture/README.md
#	docs/package.json
#	docs/versions
@mergify mergify bot requested a review from a team as a code owner February 2, 2023 20:17
@mergify mergify bot added the conflicts label Feb 2, 2023
@cason cason changed the title Removing all the vuepress related build files and references (backport #253) v0.34.x: Removing all the vuepress related build files and references (backport #253) Feb 8, 2023
@andynog andynog requested a review from thanethomson February 8, 2023 20:15
@andynog andynog merged commit 892516a into v0.34.x Feb 9, 2023
@andynog andynog deleted the mergify/bp/v0.34.x/pr-253 branch February 9, 2023 19:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

No open projects
Status: Done

Development

Successfully merging this pull request may close these issues.

3 participants