Skip to content

📖 (docs/alpha update): remove suggestion marker #4953

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
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion docs/book/src/reference/commands/alpha_update.md
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@ These conflicts will be committed in the
<aside class="note warning">
You must manually resolve these conflicts before merging into your main branch.

```suggestion
<aside class="note warning">
<H1>If you face conflicts (using or not the --force flag) </H1>
If the merge introduces conflicts, you must resolve them and **ensure** you execute the following command to regenerate the manifests and organise the files properly:
Expand Down