Skip to content

Commit 3e943ad

Browse files
Apply suggestion from @camilamacedo86
Co-authored-by: Camila Macedo <7708031+camilamacedo86@users.noreply.github.com>
1 parent e4479c3 commit 3e943ad

File tree

1 file changed

+8
-12
lines changed

1 file changed

+8
-12
lines changed

docs/book/src/reference/commands/alpha_update.md

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -111,27 +111,23 @@ These conflicts will be committed in the
111111
<aside class="note warning">
112112
You must manually resolve these conflicts before merging into your main branch.
113113

114-
### Required Steps If Conflicts Are Present
114+
```suggestion
115+
<aside class="note warning">
116+
<H1>If you face conflicts (using or not the --force flag) </H1>
117+
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:
115118
116-
If the merge introduces conflicts, follow these steps before committing any final changes:
117-
1. Resolve Conflicts;
118-
2. Open the conflicted files and manually edit them to resolve all merge markers;
119-
3. Run Required Make Targets;
120-
4. After resolving, run the following command to regenerate, format, vet, and lint the code:
121-
```
119+
```bash
122120
make manifests generate fmt vet lint-fix
123121
```
124122

125-
### Optional (but Recommended)
123+
Alternatively, you may want to run:
126124

127-
1. Run the full validation suite to ensure your project remains consistent and working:
128-
```
125+
```bash
129126
make all
130127
```
131-
2. Create Pull Request
132-
After validation, commit your changes and push a pull request from `tmp-kb-update-merge` to your target branch.
133128
</aside>
134129

130+
135131
## When to Use `--force`
136132
Use `--force` only in scenarios like:
137133
- Automated environments (e.g., CI pipelines or cron jobs)

0 commit comments

Comments
 (0)