Skip to content

Reorganize existing guides (backport #492)#528

Merged
lasarojc merged 4 commits intov0.34.xfrom
mergify/bp/v0.34.x/pr-492
Mar 14, 2023
Merged

Reorganize existing guides (backport #492)#528
lasarojc merged 4 commits intov0.34.xfrom
mergify/bp/v0.34.x/pr-492

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Mar 14, 2023

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

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

You are currently cherry-picking commit fa98b5ece.
  (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:
	renamed:    docs/tutorials/README.md -> docs/guides/README.md
	renamed:    docs/tutorials/go-built-in.md -> docs/guides/go-built-in.md
	renamed:    docs/tutorials/go.md -> docs/guides/go.md
	renamed:    docs/introduction/install.md -> docs/guides/install.md
	renamed:    docs/introduction/quick-start.md -> docs/guides/quick-start.md
	deleted:    docs/tutorials/java.md
	deleted:    docs/tutorials/kotlin.md

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   docs/README.md
	added by us:     docs/guides/java.md
	added by us:     docs/guides/kotlin.md
	both modified:   docs/introduction/README.md
	deleted by them: docs/introduction/what-is-cometbft.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

* Moves all guides to a guids folder

* Moves the actual intro to the README.md of the intro folder

* Add guides to the guide README.md

* Fixing links in docs/README.md

(cherry picked from commit fa98b5e)

# Conflicts:
#	docs/README.md
#	docs/guides/java.md
#	docs/guides/kotlin.md
#	docs/introduction/README.md
#	docs/introduction/what-is-cometbft.md
@mergify mergify bot requested a review from a team as a code owner March 14, 2023 13:03
@mergify mergify bot added the conflicts label Mar 14, 2023
@lasarojc lasarojc self-assigned this Mar 14, 2023
@lasarojc lasarojc merged commit c7edf61 into v0.34.x Mar 14, 2023
@lasarojc lasarojc deleted the mergify/bp/v0.34.x/pr-492 branch March 14, 2023 14:20
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.

1 participant