nixpkgs/pkgs/development
Vladimír Čunát 89023c38fc
Recover the complicated situation after my bad merge
I made a mistake merge.  Reverting it in c778945806 undid the state
on master, but now I realize it crippled the git merge mechanism.
As the merge contained a mix of commits from `master..staging-next`
and other commits from `staging-next..staging`, it got the
`staging-next` branch into a state that was difficult to recover.

I reconstructed the "desired" state of staging-next tree by:
 - checking out the last commit of the problematic range: 4effe769e2
 - `git rebase -i --preserve-merges a8a018ddc0` - dropping the mistaken
   merge commit and its revert from that range (while keeping
   reapplication from 4effe769e2)
 - merging the last unaffected staging-next commit (803ca85c20)
 - fortunately no other commits have been pushed to staging-next yet
 - applying a diff on staging-next to get it into that state
2020-10-26 09:01:04 +01:00
..
androidndk-pkgs
arduino
beam-modules
bower-modules/generic
chez-modules
compilers Recover the complicated situation after my bad merge 2020-10-26 09:01:04 +01:00
coq-modules
dhall-modules
dotnet-modules
em-modules/generic
go-modules
go-packages
guile-modules
haskell-modules haskellPackages.trifecta: dontCheck on darwin 2020-10-25 15:59:31 +10:00
idris-modules
interpreters Recover the complicated situation after my bad merge 2020-10-26 09:01:04 +01:00
java-modules
libraries Recover the complicated situation after my bad merge 2020-10-26 09:01:04 +01:00
lisp-modules lispPackages.nyxt: build a binary 2020-10-25 01:30:44 +02:00
lua-modules
misc hasura-graphql-engine: mark build as broken 2020-10-23 21:00:26 +02:00
mobile treewide: remove periods from end of package descriptions 2020-10-17 08:22:31 -07:00
node-packages fx: init at 20.0.2 (#100828) 2020-10-19 20:38:17 +00:00
ocaml-modules ocamlPackages.ocaml_sqlite3: 5.0.1 -> 5.0.2 2020-10-25 09:38:53 +01:00
perl-modules
pharo
php-packages Merge pull request #101535 from etu/php-packages-updates 2020-10-24 14:39:47 +02:00
pure-modules
python-modules Recover the complicated situation after my bad merge 2020-10-26 09:01:04 +01:00
r-modules Fixes missing configure script 2020-10-23 14:40:18 +02:00
ruby-modules
tools Recover the complicated situation after my bad merge 2020-10-26 09:01:04 +01:00
web twitterBootstrap: 4.5.2 -> 4.5.3 2020-10-25 09:42:37 +01:00