sid/sid.ovh
1
0
Fork 0
Code Issues 3 Pull requests 3 Projects Releases Packages Wiki Activity Actions

WIP: ha redesign #128

Draft
sid wants to merge 3 commits from ha-redesign into master
pull from: ha-redesign
merge into: sid:master
Conversation 0 Commits 3 Files changed 43 +505 -475
sid commented 2026-07-02 21:25:52 +02:00
Owner
Copy link
No description provided.
initial commit
Some checks failed
Build hosts / build-hosts (pull_request) Has been cancelled
Details
Flake check / flake-check (pull_request) Has been cancelled
Details
76af805e4b
main: installation. add disko and hardware config
Some checks failed
Build hosts / build-hosts (pull_request) Has been cancelled
Details
Flake check / flake-check (pull_request) Has been cancelled
Details
76412d8c57
main: add sops. add tailscale
Some checks failed
Flake check / flake-check (pull_request) Has been cancelled
Details
Build hosts / build-hosts (pull_request) Has been cancelled
Details
36a68ee399
Some checks failed
Flake check / flake-check (pull_request) Has been cancelled
Details
Build hosts / build-hosts (pull_request) Has been cancelled
Details
This pull request has changes conflicting with the target branch.
  • flake.lock
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 ha-redesign:ha-redesign
git switch ha-redesign

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 master
git merge --no-ff ha-redesign
git switch ha-redesign
git rebase master
git switch master
git merge --ff-only ha-redesign
git switch ha-redesign
git rebase master
git switch master
git merge --no-ff ha-redesign
git switch master
git merge --squash ha-redesign
git switch master
git merge --ff-only ha-redesign
git switch master
git merge ha-redesign
git push origin master
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
bug
Something is not working

  
duplicate
This issue or pull request already exists

  
enhancement
New feature

  
help wanted
Need some help

  
invalid
Something is wrong

  
question
More information is needed

  
wontfix
This won't be fixed

No labels
bug
duplicate
enhancement
help wanted
invalid
question
wontfix
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
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
sid/sid.ovh!128
No description provided.