Skip to content

Commit

Permalink
🏗️ Migrate copy-button to Mkdocs from Sphinx
Browse files Browse the repository at this point in the history
  • Loading branch information
ebouchut committed Oct 13, 2024
1 parent dbc0b91 commit e41cf1d
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions docs/EN/operate/build.md
Original file line number Diff line number Diff line change
Expand Up @@ -301,8 +301,7 @@ The second command `git pull --recurse` does several things:

There can be errors in several places, for example:

```{code-block}
:class: no-copybutton
``` { .txt .no-copy }
error: Your local changes to the following files would be overwritten by merge:
FreeAPS/folder/file.swift
Please commit your changes or stash them before you merge.
Expand All @@ -319,15 +318,13 @@ The `pull` command halts at this error and does not move on updating the submodu
* If there are no updates to submodules, you won't see any submodule update messages - that is not uncommon
* If there are updates to one or more submodules with no errors, you will see messages indicating the submodules are being checked out similar to the one below

```{code-block}
:class: no-copybutton
``` { .txt .no-copy }
Submodule path 'ModuleName': checked out 'f11abde5e2eea2cbf7ac80f3f4bc4bc6e7f6de56'
```

If you see the word `error` or `conflict` on the output, similar to the following, head over to [Fix Submodule Conflicts](#fix-submodule-conflicts).

```{code-block}
:class: no-copybutton
``` { .txt .no-copy }
error: Your local changes to the following files would be overwritten by checkout:
SubModuleName/folder/file.swift
Please commit your changes or stash them before you switch branches.
Expand Down

0 comments on commit e41cf1d

Please sign in to comment.