devicestate: merge overlord/boot into devicestate #2108
Closed
Conversation
This file contains 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
But keep `snap firstboot` around because we can not update files in the writable area once they are moved out of the snap (yes, this sucks!).
|
Arrrrrgg, conflicts from squashing! |
|
Remember when rebasing on-top of squash commits, to use the more advanced git rebase of: git rebase --onto master start-of-changes-I-want-to-rebase my-branch Where start-of-changes-I-want-to-rebase is the commit before the stuff you're rebasing. This ensures git doesn't get confused and try to rebase commits that have already been included in the squash. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
based on #2033