Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 2526f2272376
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: b8edd6cde989
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Nov 28, 2020

  1. GH Action: merge staging(-next) periodically 

    Automate the merging of `master` -> `staging-next` -> `staging`.

Our main development branch is `master`. Large rebuilds go to `staging`.
Periodically, `staging` is merged into `staging-next` for stabilization.
When considered sufficiently stable, `staging-next` is merged into
`master`.

As changes arrive on these branches, it is important that they're all
updated regularly with eachothers changes. This commit automates that
part.
    @FRidh
    FRidh committed Nov 28, 2020
    Copy the full SHA
    24884e5 View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2020

  1. GH Action: merge staging(-next): comment on failure 

    Comment on the designated issue in case of a failure.

Whoever wants to help out resolving merge conflicts can simply follow
this issue.
    @FRidh
    FRidh committed Nov 29, 2020
    Copy the full SHA
    318f929 View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2020

  1. Merge pull request #105153 from FRidh/action-merge-staging 

    GH Action: merge staging(-next) periodically
    @FRidh
    FRidh committed Dec 2, 2020
    Copy the full SHA
    b8edd6c View commit details
    Browse the repository at this point in the history