latest changes on kiwi #2

Open
bitethekiwi wants to merge 2 commits from kiwi into main
Owner

update when flake.lock can be updated!!!

update when flake.lock can be updated!!!
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 kiwi:kiwi
git switch kiwi

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 kiwi
git switch kiwi
git rebase main
git switch main
git merge --ff-only kiwi
git switch kiwi
git rebase main
git switch main
git merge --no-ff kiwi
git switch main
git merge --squash kiwi
git switch main
git merge --ff-only kiwi
git switch main
git merge kiwi
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
bitethekiwi/asahinix-kiwi!2
No description provided.