index
:
baserock/baserock/morph.git
adamcoldrick/ingest-binaries-v5-rebase
baserock-13-staging
baserock/6453f312359f4317803ef7f14b58d21f/d675b946df4f456693ed211dcd2ec95e
baserock/adam_richard/ssh_keys
baserock/adamcoldrick/build-graph-speedups
baserock/adamcoldrick/build-graph-speedups-v2
baserock/adamcoldrick/build-graph-speedups-with-pylru
baserock/adamcoldrick/chunk-morphologies-in-definitions
baserock/adamcoldrick/chunks-in-defs-with-morph-edit-changes
baserock/adamcoldrick/deploy-specific-systems
baserock/adamcoldrick/deploy-specific-systems-v2
baserock/adamcoldrick/deploy-specific-systems-v3
baserock/adamcoldrick/deploy-specific-systems-v4
baserock/adamcoldrick/deploy-specific-systems-v5
baserock/adamcoldrick/exts-in-subdirs
baserock/adamcoldrick/fix-broken-pipe-busy-loop
baserock/adamcoldrick/fix-job-cancellation
baserock/adamcoldrick/git-fat-handle-whitespace-rebase
baserock/adamcoldrick/load-chunks-from-definitions
baserock/adamcoldrick/load-chunks-from-definitions-v2
baserock/adamcoldrick/load-chunks-from-definitions-wip
baserock/adamcoldrick/metadata-fix
baserock/adamcoldrick/no-fake-morph
baserock/adamcoldrick/no-orig-fields-in-cache-key
baserock/adamcoldrick/ostree
baserock/adamcoldrick/ostree-rebase
baserock/adamcoldrick/partial-builds
baserock/adamcoldrick/partial-deploy
baserock/adamcoldrick/ref-manifest
baserock/adamcoldrick/remove-morph2
baserock/adamcoldrick/remove-morph2-tweaked
baserock/adamcoldrick/remove-morph2-v2
baserock/adamcoldrick/remove-morph2-wip
baserock/adamcoldrick/speed-up-artifact-serialisation
baserock/adamcoldrick/speed-up-artifact-serialisation-v3
baserock/adamcoldrick/speed-up-artifact-serialisation-v4
baserock/adamcoldrick/speed-up-distbuild-ipc
baserock/adamcoldrick/speedups-with-pylru
baserock/adamcoldrick/use-local-definitions
baserock/adamcoldrick/use-ostree-for-artifact-cache
baserock/adamcoldrick/use-overlayfs-when-deploying
baserock/adamcoldrick/wip-distbuild-fixes
baserock/adamcoldrick/wip-ostree
baserock/adamcoldrick/wip-partial-builds
baserock/adamcoldrick/wip-partial-deploy
baserock/danielsilverstone/distbuild-fiddling
baserock/danielsilverstone/memoise-cache-keys-better
baserock/danielsilverstone/vagrant-support
baserock/edcragg/independent-build-wip
baserock/franred/S11387/add-morph-field-to-morphologies
baserock/franred/bugfix/python-tarfile-chown
baserock/franred/check-for-commit-object-in-submodule-path
baserock/franred/fixes-needed-for-organize-definitions
baserock/james/img-upgrade
baserock/james/writeexts_support_jetson
baserock/liw/distbuild-fixes
baserock/liw/xfer-hole
baserock/markdoffman/S10382/add-help-option
baserock/markdoffman/s10382/add-help-option-v2
baserock/markdoffman/s10382/add-help-option-v3
baserock/markdoffman/s10617/add-yaml-help-option
baserock/pedroalvarez/cachedir-creation-bug
baserock/pedroalvarez/conf-exts-cache-key
baserock/pedroalvarez/cross-bootstrap-improvements
baserock/pedroalvarez/defv8
baserock/pedroalvarez/defv8-no-schemas
baserock/pedroalvarez/defv8-submodules-squashed
baserock/pedroalvarez/fix-distbuild-bug
baserock/pedroalvarez/fix-tests
baserock/pedroalvarez/fix-xfer-hole
baserock/pedroalvarez/gear-wip
baserock/pedroalvarez/morph-help-fix
baserock/pedroalvarez/morph-not-failing
baserock/pedroalvarez/morph-version-fix
baserock/pedroalvarez/new-petrify
baserock/pedroalvarez/openstack-check-improvements
baserock/pedroalvarez/openstack-exts-fixups
baserock/pedroalvarez/os-improvement
baserock/pedroalvarez/rawdisk-to-device
baserock/pedroalvarez/rawdisk-to-device2
baserock/pedroalvarez/rawdisk-to-device3
baserock/pedroalvarez/rawdisk-to-device4
baserock/pedroalvarez/rawdisk-to-device5
baserock/pedroalvarez/rawdisk-to-device6
baserock/pedroalvarez/rawdisk-to-device7
baserock/pedroalvarez/rawdisk-to-device8
baserock/pedroalvarez/remove-queueing
baserock/pedroalvarez/repo-ref-options
baserock/pedroalvarez/rpi
baserock/pedroalvarez/system-integration-fixup
baserock/pedroalvarez/system-integration-fixup2
baserock/pedroalvarez/tempdir-race-conditions-v2
baserock/pedroalvarez/unicode-error
baserock/pedroalvarez/upgrades-to-default
baserock/pedroalvarez/uuid-upgrades
baserock/pedroalvarez/wip-gear
baserock/ps/add-lorry
baserock/ps/clarify-that-build-is-caching
baserock/ps/deploy-dont-update-gits
baserock/ps/foo
baserock/ps/gc-clear-deployments-too
baserock/ps/hardcode-default-dirs
baserock/ps/log-chunk-build-times
baserock/ps/log-env-and-full-cmdline
baserock/ps/message-fix
baserock/ps/metadata-hack
baserock/ps/show-8-chars
baserock/ps/show-which-sha-is-building
baserock/ps/simple-edit-syntax
baserock/ps/wip-ybd-hack
baserock/richardmaw-os/unify-namespace-logic
baserock/richardmaw/S11284/morphologies-by-path
baserock/richardmaw/S11284/morphologies-by-path-v2
baserock/richardmaw/S11284/morphologies-by-path-v3
baserock/richardmaw/S11284/morphologies-by-path-v4
baserock/richardmaw/S11416/no-unnecessary-temp-branches
baserock/richardmaw/always-use-current-branch
baserock/richardmaw/bugfix/branch-from-deployed-image
baserock/richardmaw/bugfix/distbuild-eglibc
baserock/richardmaw/bugfix/fix-list-artifacts
baserock/richardmaw/bugfix/http-fail
baserock/richardmaw/bugfix/stagingarea-mounts-inside-destdir
baserock/richardmaw/bugfix/stagingarea-mounts-inside-destdir-v2
baserock/richardmaw/bugfix/stop-decoding-distbuild-comms
baserock/richardmaw/bugfix/symlink-include
baserock/richardmaw/bugfix/unicode-safe-json
baserock/richardmaw/bugfix/unicode-safe-paths
baserock/richardmaw/bugfix/yaml-multi-line-dump
baserock/richardmaw/deploy-improvements
baserock/richardmaw/fix-distbuild
baserock/richardmaw/fix-distbuild-v2
baserock/richardmaw/fix-ssh-rsync-destroying-versions
baserock/richardmaw/fixup-ro-integrations
baserock/richardmaw/james/writeexts_support_jetson
baserock/richardmaw/less-ls-remote
baserock/richardmaw/morph-diff
baserock/richardmaw/ostree-squash
baserock/richardmaw/parallelism-improvements
baserock/richardmaw/run-parallel-yarns
baserock/richardmaw/stratum-runtime-depends
baserock/richardmaw/test-system-integrations
baserock/richardmaw/tmp
baserock/richardmaw/yarn-git-daemon
baserock/robkendrick/mips64
baserock/robtaylor/fix-change-ref
baserock/samthursfield/morphloader-test-cleanup
baserock/tiagogomes/cleanup-yarns
baserock/tiagogomes/farewell-system-branches
baserock/tiagogomes/multiple-sources
baserock/tiagogomes/submodules
basreock/richardipsum/improve_annotation_failed_errmsg
benbrown/nfsboot-fix
jannispohlmann/resolve-refs-and-morphologies-in-batches
jjardon/copyrigth
jjardon/no_build_depends
jjardon/simple-network-networkd
jjardon/simple-network-networkd2
jjardon/version_check
jjardon/versioning
jjardon/versioning_support
master
richardipsum/9579/fix_conflicting_strata
richardipsum/armv7lhf_port
richardipsum/distbuild
richardipsum/fix_traverse_morphs
richardipsum/gc_plugin_improve_help
richardipsum/install_files_mod
richardipsum/s9461/detect_armhf
richardipsum/s9532/fix_morph_edit_behaviour
sam/adamcoldrick-ostree-rebase
sam/distbuild-ansible
sam/distbuild-build-logs-science
sam/distbuild-controller-job-tracking
sam/distbuild-fixes
sam/distbuild-handle-socket-error
sam/distbuild-hang-fix
sam/distbuild-megamix
sam/distbuild-nfsboot.write
sam/distbuild-test-harness
sam/distbuild-tests
sam/docker.write
sam/escape-non-utf8-strings
sam/fix-fetch-errors
sam/list-cache-keys
sam/list-system-contents
sam/log-env-in-build-log
sam/morph-name-matches-filename
sam/no-git-update-fixes
sam/no-repo-alias-logging
sam/one-repo-cache
sam/ostree-fixes-1
sam/petrify-hack
sam/python3
sam/ruby-integration
sam/ruby-integration-old
sam/ruby-integration-old-2
sam/ruby-using-gems
sam/sandboxlib
sam/splitting-fixes-plus-other-stuff
sam/validation
sam/validation-proto
sam/wip
sam/workspaces-optional-3
tiagogomes/improve-debugging
tiagogomes/systems-build-time
tlsa/certify-reproducibility
tlsa/chunk-ref-sha1-warnings
tlsa/cve-check
tlsa/manifests
Morph -- Baserock build tool
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
tests.branching
/
merge-handles-unmergable-cases.stderr
blob: 513db2b88632dfaae45667e1bb36033d942fa90f (
plain
)
1
ERROR: merge conflict: "kind" of morphology hello-stratum
