Skip to content

chore: updates in preparation for v1.0.0-rc2 (backport #4454)#4518

Merged
andynog merged 2 commits intov1.xfrom
mergify/bp/v1.x/pr-4454
Nov 20, 2024
Merged

chore: updates in preparation for v1.0.0-rc2 (backport #4454)#4518
andynog merged 2 commits intov1.xfrom
mergify/bp/v1.x/pr-4454

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Nov 20, 2024

Updates in preparation for v1.0.0-rc2:

  • summary.md
  • Tutorial instructions

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

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

Updates  in preparation for `v1.0.0-rc2`:

- `summary.md`
- Tutorial instructions

#### 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

---------

Co-authored-by: Daniel <daniel.cason@informal.systems>
Co-authored-by: Anton Kaliaev <anton.kalyaev@gmail.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
(cherry picked from commit 0cb58b5)

# Conflicts:
#	.changelog/unreleased/summary.md
@mergify mergify bot requested a review from a team as a code owner November 20, 2024 14:22
@mergify mergify bot requested a review from a team November 20, 2024 14:22
@mergify mergify bot added the conflicts label Nov 20, 2024
@mergify
Copy link
Contributor Author

mergify bot commented Nov 20, 2024

Cherry-pick of 0cb58b5 has failed:

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

You are currently cherry-picking commit 0cb58b55c.
  (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/tutorials/forum-application/9.run-app.md

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .changelog/unreleased/summary.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 067aefa into v1.x Nov 20, 2024
@andynog andynog deleted the mergify/bp/v1.x/pr-4454 branch November 20, 2024 14:36
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.

1 participant