Skip to content

docs: merging configuration documents (backport #2948)#2963

Merged
andynog merged 1 commit intov1.xfrom
mergify/bp/v1.x/pr-2948
May 1, 2024
Merged

docs: merging configuration documents (backport #2948)#2963
andynog merged 1 commit intov1.xfrom
mergify/bp/v1.x/pr-2948

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented May 1, 2024

closes #2769

merging configuration documents


PR checklist

  • Tests written/updated
  • Changelog entry added in .changelog (we use unclog to manage our changelog)
  • Updated relevant documentation (docs/ or spec/) and code comments
  • Title follows the Conventional Commits spec

This is an automatic backport of pull request #2948 done by [Mergify](https://mergify.com).

closes #2769

merging configuration documents

---

#### PR checklist

- [ ] Tests written/updated
- [X] Changelog entry added in `.changelog` (we use
[unclog](https://github.com/informalsystems/unclog) to manage our
changelog)
- [X] Updated relevant documentation (`docs/` or `spec/`) and code
comments
- [X] Title follows the [Conventional
Commits](https://www.conventionalcommits.org/en/v1.0.0/) spec

(cherry picked from commit 88c527b)

# Conflicts:
#	docs/explanation/core/configuration.md
@mergify mergify bot requested a review from a team as a code owner May 1, 2024 12:41
@mergify mergify bot requested a review from a team May 1, 2024 12:41
@mergify mergify bot added the conflicts label May 1, 2024
@mergify
Copy link
Contributor Author

mergify bot commented May 1, 2024

Cherry-pick of 88c527b has failed:

On branch mergify/bp/v1.x/pr-2948
Your branch is up to date with 'origin/v1.x'.

You are currently cherry-picking commit 88c527bda.
  (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:
	new file:   .changelog/unreleased/improvements/2769-merge-config-docs.md
	modified:   docs/references/config/config.toml.md

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   docs/explanation/core/configuration.md

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

Copy link
Collaborator

@andynog andynog left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@andynog andynog merged commit a48012d into v1.x May 1, 2024
@andynog andynog deleted the mergify/bp/v1.x/pr-2948 branch May 1, 2024 12:58
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