Jared Tobin 7ca71fb315 sh: add merge helper script [ci skip] ... Often one needs to merge branches in which the LFS-stored solid pill conflicts with what's in master. The conflict has to be resolved manually, but the procedure for doing so is mechanical in practice. This adds a simple script for automating that.		2019-11-15 18:39:39 +08:00
..
boot	Get cross-compilation ready for release. (#1263)	2019-05-02 13:13:48 -07:00
bootstrap	Nix Build + Monorepo Structure (#1196)	2019-03-04 16:43:53 -08:00
build-interface	added single command to build interface files	2019-07-24 15:14:16 -07:00
cachix	only update cachix if credentials are available	2019-07-15 14:46:36 -07:00
ci-tests	removes brass pill staging from merge builds in CI	2019-07-01 14:16:02 -07:00
create-ropsten-pills	build: use HEAD in sh/create-ropsten-pills	2019-11-06 20:14:51 +09:00
cross	Get cross-compilation ready for release. (#1263)	2019-05-02 13:13:48 -07:00
image	build: simplify image build interface	2019-10-22 10:18:37 +08:00
load-arvo	Misc cleanup blocking CC-Release. (#1249)	2019-04-24 17:27:27 -07:00
merge_and_update_solid	sh: add merge helper script [ci skip]	2019-11-15 18:39:39 +08:00
print-core-backtrace	Nix Build + Monorepo Structure (#1196)	2019-03-04 16:43:53 -08:00
release	Get cross-compilation ready for release. (#1263)	2019-05-02 13:13:48 -07:00
test	fixes unit-test failure predicate to also catch +test failures	2019-08-08 23:31:15 -07:00
update-brass-pill	Get cross-compilation ready for release. (#1263)	2019-05-02 13:13:48 -07:00
update-ivory-pill	Added update-ivory-pill script	2019-07-19 16:05:46 -07:00
update-solid-pill	Get cross-compilation ready for release. (#1263)	2019-05-02 13:13:48 -07:00