embed_secrets #1

Open
rpickler wants to merge 0 commits from embed_secrets into main
Owner
No description provided.
This pull request has changes conflicting with the target branch.
  • modules/backup.nix
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin embed_secrets:embed_secrets
git switch embed_secrets

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch main
git merge --no-ff embed_secrets
git switch embed_secrets
git rebase main
git switch main
git merge --ff-only embed_secrets
git switch embed_secrets
git rebase main
git switch main
git merge --no-ff embed_secrets
git switch main
git merge --squash embed_secrets
git switch main
git merge --ff-only embed_secrets
git switch main
git merge embed_secrets
git push origin main
Sign in to join this conversation.
No reviewers
No labels
No milestone
No project
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
richardpickler.com/nixos!1
No description provided.