Remove Macbook #2

Open
nki wants to merge 3 commits from remove-macbook into master
Owner
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.
  • darwin/brew.nix
  • darwin/configuration.nix
  • flake.lock
  • flake.nix
  • home/macbook-home.nix
  • home/macbook-nixos.nix
  • home/modules/programs/my-kitty/darwin.nix
  • home/modules/programs/my-kitty/default.nix
  • kagami-air-m1/configuration.nix
  • kagami-air-m1/hardware-configuration.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.

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 checkout master
git merge --no-ff remove-macbook
git checkout remove-macbook
git rebase master
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.
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".

2024-07-30

Dependencies

No dependencies set.

Reference: nki/nix-home#2
No description provided.