nki/nix-home
1
0
Fork 0
Code Issues Pull requests 1 Packages Projects Releases Wiki Activity

Remove Macbook #2

Open
nki wants to merge 3 commits from remove-macbook into master
pull from: remove-macbook
merge into: nki:master
Conversation 0 Commits 3 Files changed 19 +3 -817
nki commented 2024-07-23 16:04:06 +00:00
Owner
Copy link
No description provided.
nki added 2 commits 2024-07-23 16:04:06 +00:00
nki added 1 commit 2024-07-23 16:05:08 +00:00
This pull request has changes conflicting with the target branch.
  • flake.lock
  • flake.nix
  • kagami-air-m1/configuration.nix
  • modules/my-tinc/hosts/default.nix
  • overlay.nix
View command line instructions

Checkout

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

Merge

Merge the changes and update on Forgejo.
git checkout master
git merge --no-ff remove-macbook
git checkout master
git merge --ff-only remove-macbook
git checkout remove-macbook
git rebase master
git checkout master
git merge --no-ff remove-macbook
git checkout master
git merge --squash remove-macbook
git checkout master
git merge --ff-only remove-macbook
git checkout master
git merge remove-macbook
git push origin master
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No labels
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".

2024-07-30

Dependencies

No dependencies set.

Reference: nki/nix-home#2
No description provided.
Delete branch "remove-macbook"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?