Skip to content

FAQ: Rework merge conflict #841

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

FAQ: Rework merge conflict #841

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 16 additions & 4 deletions source/user-guide/troubleshooting/troubleshooting.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -813,7 +813,7 @@
5c5376a90509b319de376bc18637ab896a1f480a Add factory-keys

For example, for a FoundriesFactory created with **v94.1** and updated to **v95**,
the merge conflicts are:
the merge conflicts might be such as:

.. code-block::

Expand Down Expand Up @@ -864,18 +864,30 @@
- Creation of the missing certificate files by hand and having them available
in the ``lmp-manifest/factory-keys`` folder.

For the example above, the following steps solve the conflict:
As the error may vary, there is no set of command lines to fit all the cases.
For the example above, the following steps were used to solve the conflict:

.. code-block:: bash

git rm -rf conf/keys/
git commit

But remember the list of goals: no ``conf/keys`` folder should be present after
the merge; all missing keys should be created.

.. note::
You can use the script ``/lmp-tools/scripts/rotate_ci_keys.sh``
to re-generate all the keys.
to re-generate **all the keys**.
If any key is missing, a new file will be created and
you can commit that file.
you can commit only that file.
But remember to not override any existing key without the additional steps!

For example, if you decide to use the ``/lmp-tools/scripts/rotate_ci_keys.sh``
to generate a new file for each key, you can `git add` any freshely created file
and `git restore` any modified file.

When rotating an existing key, it is critical to make sure the boot sequence is

Check warning on line 889 in source/user-guide/troubleshooting/troubleshooting.rst

View workflow job for this annotation

GitHub Actions / runner / vale 

[vale] reported by reviewdog 🐶
[Fio-docs.sentence-length] Aim for sentences no longer than 25 words

Raw Output:
{"message": "[Fio-docs.sentence-length] Aim for sentences no longer than 25 words", "location": {"path": "source/user-guide/troubleshooting/troubleshooting.rst", "range": {"start": {"line": 889, "column": 1}}}, "severity": "INFO"}
updated accordingly as the new key value might impact the whole system.

Jailhouse support in LmP is removed
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Expand Down
Loading