Fix common anchestry after last sync with prod PR#63
Merged
ThomasClausnitzer merged 2 commits intomainfrom Mar 27, 2026
Merged
Conversation
* Add tailored STPA risk analysis * Add tailored STPA risk analysis - fixes
LucaFue
approved these changes
Mar 27, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The last sync with prod PR #62 again broke the common anchestry, as the new commit db4e1b3 was not based on the common anchestry we had enabled in PR #59. We therefore need again a merge PR to fix the common history for the next upstream PR.