You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: docs/book/src/reference/commands/alpha_update.md
-1Lines changed: 0 additions & 1 deletion
Original file line number
Diff line number
Diff line change
@@ -111,7 +111,6 @@ These conflicts will be committed in the
111
111
<asideclass="note warning">
112
112
You must manually resolve these conflicts before merging into your main branch.
113
113
114
-
```suggestion
115
114
<asideclass="note warning">
116
115
<H1>If you face conflicts (using or not the --force flag) </H1>
117
116
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:
0 commit comments