Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

contributing.md: mention rebased or squashed merges #98330

Merged
merged 1 commit into from Sep 20, 2020
Merged

contributing.md: mention rebased or squashed merges #98330

merged 1 commit into from Sep 20, 2020

Conversation

jonringer
Copy link
Contributor

@jonringer jonringer commented Sep 20, 2020 •
edited

Motivation for this change

Mention squash or rebase merge strategies for selecting the correct commit to backport

See: #98308 (comment)

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

bcdarwin
bcdarwin approved these changes Sep 20, 2020
View reviewed changes
Copy link
Member

@bcdarwin bcdarwin left a comment •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great to me (I guess the new text could also go in step 1 but this is fine).

@worldofpeace worldofpeace merged commit 8f00cc4 into NixOS:master Sep 20, 2020
@jonringer jonringer deleted the update-contributing branch September 20, 2020 22:03
@jonringer
Copy link
Contributor Author

@bcdarwin I guess that's fair. I think I was approaching this from the aspect of determining the hash needed for -x, but step 1 does align better with commit selection

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bcdarwin bcdarwin bcdarwin approved these changes

@worldofpeace worldofpeace worldofpeace approved these changes

Assignees
No one assigned
Labels
6.topic: policy discussion 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@jonringer @bcdarwin @worldofpeace