suzanne.soy/nixpkgs
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Crack attack sound #1

Open
SuzanneSoy wants to merge 1 commits from crack-attack-sound into master
pull from: crack-attack-sound
merge into: suzanne.soy:master
Conversation 0 Commits 1 Files Changed 1 +5 -4
SuzanneSoy commented 2017-02-24 00:50:14 +00:00 (Migrated from github.com)
Copy Link
Motivation for this change
Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.
###### Motivation for this change ###### Things done - [ ] Tested using sandboxing ([nix.useSandbox](http://nixos.org/nixos/manual/options.html#opt-nix.useSandbox) on NixOS, or option `build-use-sandbox` in [`nix.conf`](http://nixos.org/nix/manual/#sec-conf-file) on non-NixOS) - Built on platform(s) - [ ] NixOS - [ ] macOS - [ ] Linux - [ ] Tested compilation of all pkgs that depend on this change using `nix-shell -p nox --run "nox-review wip"` - [ ] Tested execution of all binary files (usually in `./result/bin/`) - [ ] Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md). ---
This pull request has changes conflicting with the target branch.
  • pkgs/games/crack-attack/default.nix
View command line instructions.

Checkout

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

Merge

Merge the changes and update on Gitea.
git checkout master
git merge --no-ff crack-attack-sound
git checkout master
git merge --ff-only crack-attack-sound
git checkout crack-attack-sound
git rebase master
git checkout master
git merge --no-ff crack-attack-sound
git checkout master
git merge --squash crack-attack-sound
git checkout master
git merge --ff-only crack-attack-sound
git checkout master
git merge crack-attack-sound
git push origin master
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
bug

   
duplicate

   
enhancement

   
help wanted

   
invalid

   
question

   
wontfix
No Label
bug
duplicate
enhancement
help wanted
invalid
question
wontfix
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
1 Participants
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: suzanne.soy/nixpkgs#1
No description provided.
Delete Branch "crack-attack-sound"

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?