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
mobile
node-packages
ocaml-modules	ocamlPackages.ocaml_sqlite3: 5.0.1 -> 5.0.2	2020-10-25 09:38:53 +01:00
perl-modules
pharo
php-packages
pure-modules
python-modules	Recover the complicated situation after my bad merge	2020-10-26 09:01:04 +01:00
r-modules
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