[INFO] cloning repository https://github.com/cyclopunk/labyrinth-brew-game [INFO] running `Command { std: "git" "-c" "credential.helper=" "-c" "credential.helper=/workspace/cargo-home/bin/git-credential-null" "clone" "--bare" "https://github.com/cyclopunk/labyrinth-brew-game" "/workspace/cache/git-repos/https%3A%2F%2Fgithub.com%2Fcyclopunk%2Flabyrinth-brew-game", kill_on_drop: false }` [INFO] [stderr] Cloning into bare repository '/workspace/cache/git-repos/https%3A%2F%2Fgithub.com%2Fcyclopunk%2Flabyrinth-brew-game'... [INFO] running `Command { std: "git" "rev-parse" "HEAD", kill_on_drop: false }` [INFO] [stdout] 9cc5549f1a7fb44f95437a91b11b8cc27cf7b40c [INFO] checking cyclopunk/labyrinth-brew-game/9cc5549f1a7fb44f95437a91b11b8cc27cf7b40c against master#ff1737bb00913444173658b4e0b274fd79aabf66 for pr-132712-1 [INFO] running `Command { std: "git" "clone" "/workspace/cache/git-repos/https%3A%2F%2Fgithub.com%2Fcyclopunk%2Flabyrinth-brew-game" "/workspace/builds/worker-5-tc1/source", kill_on_drop: false }` [INFO] [stderr] Cloning into '/workspace/builds/worker-5-tc1/source'... [INFO] [stderr] done. [INFO] validating manifest of git repo https://github.com/cyclopunk/labyrinth-brew-game on toolchain ff1737bb00913444173658b4e0b274fd79aabf66 [INFO] running `Command { std: CARGO_HOME="/workspace/cargo-home" RUSTUP_HOME="/workspace/rustup-home" "/workspace/cargo-home/bin/cargo" "+ff1737bb00913444173658b4e0b274fd79aabf66" "metadata" "--manifest-path" "Cargo.toml" "--no-deps", kill_on_drop: false }` [INFO] started tweaking git repo https://github.com/cyclopunk/labyrinth-brew-game [INFO] finished tweaking git repo https://github.com/cyclopunk/labyrinth-brew-game [INFO] tweaked toml for git repo https://github.com/cyclopunk/labyrinth-brew-game written to /workspace/builds/worker-5-tc1/source/Cargo.toml [INFO] crate git repo https://github.com/cyclopunk/labyrinth-brew-game already has a lockfile, it will not be regenerated [INFO] running `Command { std: CARGO_HOME="/workspace/cargo-home" RUSTUP_HOME="/workspace/rustup-home" "/workspace/cargo-home/bin/cargo" "+ff1737bb00913444173658b4e0b274fd79aabf66" "fetch" "--manifest-path" "Cargo.toml", kill_on_drop: false }` [INFO] [stderr] Updating git repository `https://github.com/insrcd/bevy.git` [INFO] [stderr] Updating crates.io index [INFO] [stderr] Downloading crates ... [INFO] [stderr] Downloaded strum v0.19.2 [INFO] [stderr] Downloaded instant v0.1.6 [INFO] [stderr] Downloaded lock_api v0.4.1 [INFO] [stderr] Downloaded strum_macros v0.19.2 [INFO] [stderr] Downloaded parking_lot v0.11.0 [INFO] [stderr] Downloaded proc-macro2 v1.0.21 [INFO] [stderr] Downloaded futures-io v0.3.5 [INFO] [stderr] Downloaded async-task v3.0.0 [INFO] [stderr] Downloaded tracing v0.1.19 [INFO] [stderr] Downloaded libloading v0.6.3 [INFO] [stderr] Downloaded owned_ttf_parser v0.8.0 [INFO] [stderr] Downloaded coreaudio-sys v0.2.5 [INFO] [stderr] Downloaded gltf-derive v0.15.2 [INFO] [stderr] Downloaded guillotiere v0.5.2 [INFO] [stderr] Downloaded gltf v0.15.2 [INFO] [stderr] Downloaded euclid v0.20.14 [INFO] [stderr] Downloaded notify v5.0.0-pre.3 [INFO] [stderr] Downloaded futures v0.3.5 [INFO] [stderr] Downloaded core-foundation v0.9.0 [INFO] [stderr] Downloaded gfx-backend-metal v0.6.2 [INFO] [stderr] Downloaded bindgen v0.53.3 [INFO] [stderr] Downloaded x11 v2.18.2 [INFO] [stderr] Downloaded gfx-hal v0.6.0 [INFO] [stderr] Downloaded image v0.23.9 [INFO] [stderr] Downloaded spirv_headers v1.5.0 [INFO] [stderr] Downloaded ttf-parser v0.8.2 [INFO] [stderr] Downloaded cmake v0.1.44 [INFO] [stderr] Downloaded futures-channel v0.3.5 [INFO] [stderr] Downloaded futures-sink v0.3.5 [INFO] [stderr] Downloaded pin-project-internal v0.4.23 [INFO] [stderr] Downloaded typed-arena v2.0.1 [INFO] [stderr] Downloaded gfx-backend-dx11 v0.6.4 [INFO] [stderr] Downloaded core-foundation-sys v0.8.0 [INFO] [stderr] Downloaded fsevent v2.0.2 [INFO] [stderr] Downloaded inotify v0.8.3 [INFO] [stderr] Downloaded erased-serde v0.3.12 [INFO] [stderr] Downloaded hexasphere v1.0.0 [INFO] [stderr] Downloaded num-rational v0.3.0 [INFO] [stderr] Downloaded spirv_cross v0.21.0 [INFO] [stderr] Downloaded core-graphics-types v0.1.0 [INFO] [stderr] Downloaded atom v0.3.5 [INFO] [stderr] Downloaded gltf-json v0.15.2 [INFO] [stderr] Downloaded ab_glyph_rasterizer v0.1.3 [INFO] [stderr] Downloaded ab_glyph v0.2.5 [INFO] [stderr] Downloaded rectangle-pack v0.1.6 [INFO] [stderr] Downloaded tempfile v3.1.0 [INFO] [stderr] Downloaded anymap v0.12.1 [INFO] [stderr] Downloaded fsevent-sys v3.0.2 [INFO] [stderr] Downloaded metal v0.20.0 [INFO] [stderr] Downloaded spirv-reflect v0.2.3 [INFO] [stderr] Downloaded pollster v0.2.0 [INFO] [stderr] Downloaded futures-macro v0.3.5 [INFO] [stderr] Downloaded gfx-backend-empty v0.6.0 [INFO] [stderr] Downloaded range-alloc v0.1.1 [INFO] [stderr] Downloaded ash v0.31.0 [INFO] [stderr] Downloaded inplace_it v0.3.2 [INFO] [stderr] Downloaded gfx-descriptor v0.2.0 [INFO] [stderr] Downloaded gfx-memory v0.2.0 [INFO] [stderr] Downloaded naga v0.2.0 [INFO] [stderr] Downloaded thiserror v1.0.20 [INFO] [stderr] Downloaded sled v0.34.3 [INFO] [stderr] Downloaded minimp3 v0.3.5 [INFO] [stderr] Downloaded storage-map v0.3.0 [INFO] [stderr] Downloaded gfx-backend-vulkan v0.6.1 [INFO] [stderr] Downloaded cart-tmp-winit v0.22.2 [INFO] [stderr] Downloaded pin-project v0.4.23 [INFO] [stderr] Downloaded d3d12 v0.3.2 [INFO] [stderr] Downloaded gfx-backend-dx12 v0.6.3 [INFO] [stderr] Downloaded gfx-auxil v0.6.0 [INFO] [stderr] Downloaded hibitset v0.6.3 [INFO] [stderr] Downloaded thiserror-impl v1.0.20 [INFO] [stderr] Downloaded tracing-core v0.1.16 [INFO] [stderr] Downloaded wgpu-core v0.6.3 [INFO] [stderr] Downloaded wgpu v0.6.0 [INFO] [stderr] Downloaded futures-lite v1.4.0 [INFO] [stderr] Downloaded ahash v0.4.4 [INFO] [stderr] Downloaded defaults v0.2.0 [INFO] [stderr] Downloaded rhai v0.18.3 [INFO] [stderr] Downloaded async-executor v0.2.1 [INFO] [stderr] Downloaded fixedbitset v0.3.1 [INFO] [stderr] Downloaded net2 v0.2.35 [INFO] [stderr] Downloaded wgpu-types v0.6.1 [INFO] [stderr] Downloaded async-channel v1.4.2 [INFO] [stderr] Downloaded fastrand v1.3.5 [INFO] [stderr] Downloaded const-random v0.1.8 [INFO] [stderr] Downloaded event-listener v2.4.0 [INFO] [stderr] Downloaded pin-project-lite v0.1.7 [INFO] [stderr] Downloaded glam v0.9.4 [INFO] [stderr] Downloaded const-random-macro v0.1.8 [INFO] [stderr] Downloaded syn v1.0.40 [INFO] [stderr] Downloaded bevy-glsl-to-spirv v0.1.7 [INFO] [stderr] Downloaded rodio v0.11.0 [INFO] running `Command { std: "docker" "create" "-v" "/var/lib/crater-agent-workspace/builds/worker-5-tc1/target:/opt/rustwide/target:rw,Z" "-v" "/var/lib/crater-agent-workspace/builds/worker-5-tc1/source:/opt/rustwide/workdir:ro,Z" "-v" "/var/lib/crater-agent-workspace/cargo-home:/opt/rustwide/cargo-home:ro,Z" "-v" "/var/lib/crater-agent-workspace/rustup-home:/opt/rustwide/rustup-home:ro,Z" "-e" "SOURCE_DIR=/opt/rustwide/workdir" "-e" "CARGO_TARGET_DIR=/opt/rustwide/target" "-e" "CARGO_HOME=/opt/rustwide/cargo-home" "-e" "RUSTUP_HOME=/opt/rustwide/rustup-home" "-w" "/opt/rustwide/workdir" "-m" "1610612736" "--user" "0:0" "--network" "none" "ghcr.io/rust-lang/crates-build-env/linux@sha256:4a844ea9eb2546a2d2c7022eacef16ef2e8229c7fbb2c7d4d55a9ceca922f72d" "/opt/rustwide/cargo-home/bin/cargo" "+ff1737bb00913444173658b4e0b274fd79aabf66" "metadata" "--no-deps" "--format-version=1", kill_on_drop: false }` [INFO] [stdout] a4615cd2597c6352ec80d9574638f66e2f2fc7e4a35323306fba1ca43f77f166 [INFO] running `Command { std: "docker" "start" "-a" "a4615cd2597c6352ec80d9574638f66e2f2fc7e4a35323306fba1ca43f77f166", kill_on_drop: false }` [INFO] running `Command { std: "docker" "inspect" "a4615cd2597c6352ec80d9574638f66e2f2fc7e4a35323306fba1ca43f77f166", kill_on_drop: false }` [INFO] running `Command { std: "docker" "rm" "-f" "a4615cd2597c6352ec80d9574638f66e2f2fc7e4a35323306fba1ca43f77f166", kill_on_drop: false }` [INFO] [stdout] a4615cd2597c6352ec80d9574638f66e2f2fc7e4a35323306fba1ca43f77f166 [INFO] running `Command { std: "docker" "create" "-v" "/var/lib/crater-agent-workspace/builds/worker-5-tc1/target:/opt/rustwide/target:rw,Z" "-v" "/var/lib/crater-agent-workspace/builds/worker-5-tc1/source:/opt/rustwide/workdir:ro,Z" "-v" "/var/lib/crater-agent-workspace/cargo-home:/opt/rustwide/cargo-home:ro,Z" "-v" "/var/lib/crater-agent-workspace/rustup-home:/opt/rustwide/rustup-home:ro,Z" "-e" "SOURCE_DIR=/opt/rustwide/workdir" "-e" "CARGO_TARGET_DIR=/opt/rustwide/target" "-e" "CARGO_INCREMENTAL=0" "-e" "RUST_BACKTRACE=full" "-e" "RUSTFLAGS=--cap-lints=allow" "-e" "RUSTDOCFLAGS=--cap-lints=allow" "-e" "CARGO_HOME=/opt/rustwide/cargo-home" "-e" "RUSTUP_HOME=/opt/rustwide/rustup-home" "-w" "/opt/rustwide/workdir" "-m" "1610612736" "--user" "0:0" "--network" "none" "ghcr.io/rust-lang/crates-build-env/linux@sha256:4a844ea9eb2546a2d2c7022eacef16ef2e8229c7fbb2c7d4d55a9ceca922f72d" "/opt/rustwide/cargo-home/bin/cargo" "+ff1737bb00913444173658b4e0b274fd79aabf66" "check" "--frozen" "--all" "--all-targets" "--message-format=json", kill_on_drop: false }` [INFO] [stdout] af94dd718cbbb7565e5675ba1cd0f4ce26483f7cf3b66e57bfda60b51e806023 [INFO] running `Command { std: "docker" "start" "-a" "af94dd718cbbb7565e5675ba1cd0f4ce26483f7cf3b66e57bfda60b51e806023", kill_on_drop: false }` [INFO] [stderr] Compiling libc v0.2.76 [INFO] [stderr] Compiling proc-macro2 v1.0.21 [INFO] [stderr] Compiling syn v1.0.40 [INFO] [stderr] Compiling log v0.4.11 [INFO] [stderr] Compiling proc-macro-hack v0.5.18 [INFO] [stderr] Checking futures-core v0.3.5 [INFO] [stderr] Checking lazy_static v1.4.0 [INFO] [stderr] Compiling getrandom v0.1.14 [INFO] [stderr] Compiling memchr v2.3.3 [INFO] [stderr] Checking futures-io v0.3.5 [INFO] [stderr] Checking once_cell v1.4.1 [INFO] [stderr] Checking ppv-lite86 v0.2.9 [INFO] [stderr] Compiling num-traits v0.2.12 [INFO] [stderr] Checking cache-padded v1.1.1 [INFO] [stderr] Compiling libloading v0.6.3 [INFO] [stderr] Compiling glam v0.9.4 [INFO] [stderr] Checking fastrand v1.3.5 [INFO] [stderr] Checking pin-project-lite v0.1.7 [INFO] [stderr] Checking concurrent-queue v1.2.2 [INFO] [stderr] Checking lock_api v0.3.4 [INFO] [stderr] Checking async-task v3.0.0 [INFO] [stderr] Checking event-listener v2.4.0 [INFO] [stderr] Checking fixedbitset v0.3.1 [INFO] [stderr] Compiling Inflector v0.11.4 [INFO] [stderr] Checking base64 v0.12.3 [INFO] [stderr] Checking lazycell v1.3.0 [INFO] [stderr] Checking crossbeam-utils v0.7.2 [INFO] [stderr] Checking futures-lite v1.4.0 [INFO] [stderr] Checking async-channel v1.4.2 [INFO] [stderr] Compiling num-integer v0.1.43 [INFO] [stderr] Checking walkdir v2.3.1 [INFO] [stderr] Checking anymap v0.12.1 [INFO] [stderr] Compiling num-iter v0.1.41 [INFO] [stderr] Compiling num-rational v0.3.0 [INFO] [stderr] Checking scoped_threadpool v0.1.9 [INFO] [stderr] Compiling pin-project-internal v0.4.23 [INFO] [stderr] Checking crossbeam-channel v0.4.4 [INFO] [stderr] Checking bytemuck v1.4.1 [INFO] [stderr] Checking instant v0.1.6 [INFO] [stderr] Checking fxhash v0.2.1 [INFO] [stderr] Compiling proc-macro-nested v0.1.6 [INFO] [stderr] Checking hex v0.4.2 [INFO] [stderr] Compiling alsa-sys v0.1.2 [INFO] [stderr] Compiling x11 v2.18.2 [INFO] [stderr] Compiling ryu v1.0.5 [INFO] [stderr] Checking futures-sink v0.3.5 [INFO] [stderr] Compiling x11-dl v2.18.5 [INFO] [stderr] Checking futures-channel v0.3.5 [INFO] [stderr] Checking futures-task v0.3.5 [INFO] [stderr] Checking lock_api v0.4.1 [INFO] [stderr] Checking arrayvec v0.5.1 [INFO] [stderr] Compiling quote v1.0.7 [INFO] [stderr] Compiling serde_json v1.0.57 [INFO] [stderr] Checking atom v0.3.5 [INFO] [stderr] Checking ash v0.31.0 [INFO] [stderr] Checking tracing-core v0.1.16 [INFO] [stderr] Checking ttf-parser v0.8.2 [INFO] [stderr] Checking num_cpus v1.13.0 [INFO] [stderr] Checking async-executor v0.2.1 [INFO] [stderr] Compiling jobserver v0.1.21 [INFO] [stderr] Checking net2 v0.2.35 [INFO] [stderr] Checking iovec v0.1.4 [INFO] [stderr] Checking rand_core v0.5.1 [INFO] [stderr] Checking inotify-sys v0.1.3 [INFO] [stderr] Checking filetime v0.2.12 [INFO] [stderr] Checking bevy_tasks v0.1.3 (https://github.com/insrcd/bevy.git#3362cc44) [INFO] [stderr] Checking raw-window-handle v0.3.3 [INFO] [stderr] Checking inotify v0.8.3 [INFO] [stderr] Checking hibitset v0.6.3 [INFO] [stderr] Compiling libm v0.1.4 [INFO] [stderr] Checking itoa v0.4.6 [INFO] [stderr] Compiling cpal v0.11.0 [INFO] [stderr] Compiling cc v1.0.59 [INFO] [stderr] Checking rand_chacha v0.2.2 [INFO] [stderr] Checking spirv_headers v1.5.0 [INFO] [stderr] Compiling const-random-macro v0.1.8 [INFO] [stderr] Checking gfx-hal v0.6.0 [INFO] [stderr] Checking euclid v0.20.14 [INFO] [stderr] Compiling inflections v1.1.1 [INFO] [stderr] Compiling cart-tmp-winit v0.22.2 [INFO] [stderr] Checking inplace_it v0.3.2 [INFO] [stderr] Checking svg_fmt v0.4.1 [INFO] [stderr] Checking rand v0.7.3 [INFO] [stderr] Checking tracing v0.1.19 [INFO] [stderr] Checking slice-deque v0.3.0 [INFO] [stderr] Checking const-random v0.1.8 [INFO] [stderr] Checking ahash v0.4.4 [INFO] [stderr] Compiling cmake v0.1.44 [INFO] [stderr] Checking wgpu-types v0.6.1 [INFO] [stderr] Checking bevy_utils v0.1.3 (https://github.com/insrcd/bevy.git#3362cc44) [INFO] [stderr] Checking percent-encoding v2.1.0 [INFO] [stderr] Checking image v0.23.9 [INFO] [stderr] Checking copyless v0.1.5 [INFO] [stderr] Checking ab_glyph_rasterizer v0.1.3 [INFO] [stderr] Checking guillotiere v0.5.2 [INFO] [stderr] Checking rectangle-pack v0.1.6 [INFO] [stderr] Checking typed-arena v2.0.1 [INFO] [stderr] Checking pollster v0.2.0 [INFO] [stderr] Compiling unicode-segmentation v1.6.0 [INFO] [stderr] Checking strum v0.19.2 [INFO] [stderr] Checking owned_ttf_parser v0.8.0 [INFO] [stderr] Checking crossbeam-epoch v0.8.2 [INFO] [stderr] Checking fs2 v0.4.3 [INFO] [stderr] Checking ab_glyph v0.2.5 [INFO] [stderr] Compiling spirv-reflect v0.2.3 [INFO] [stderr] Compiling bevy-glsl-to-spirv v0.1.7 [INFO] [stderr] Compiling minimp3-sys v0.3.2 [INFO] [stderr] Checking tempfile v3.1.0 [INFO] [stderr] Compiling heck v0.3.1 [INFO] [stderr] Checking stretch v0.3.2 [INFO] [stderr] Checking minimp3 v0.3.5 [INFO] [stderr] Compiling serde_derive v1.0.115 [INFO] [stderr] Compiling thiserror-impl v1.0.20 [INFO] [stderr] Compiling futures-macro v0.3.5 [INFO] [stderr] Compiling gltf-derive v0.15.2 [INFO] [stderr] Compiling strum_macros v0.19.2 [INFO] [stderr] Compiling defaults v0.2.0 [INFO] [stderr] Checking thiserror v1.0.20 [INFO] [stderr] Checking pin-project v0.4.23 [INFO] [stderr] Checking futures-util v0.3.5 [INFO] [stderr] Checking rodio v0.11.0 [INFO] [stderr] Checking serde v1.0.115 [INFO] [stderr] Checking futures-executor v0.3.5 [INFO] [stderr] Checking futures v0.3.5 [INFO] [stderr] Compiling toml v0.5.6 [INFO] [stderr] Checking smallvec v1.4.2 [INFO] [stderr] Checking bevy_ron v0.1.3 (https://github.com/insrcd/bevy.git#3362cc44) [INFO] [stderr] Checking erased-serde v0.3.12 [INFO] [stderr] Checking uuid v0.8.1 [INFO] [stderr] Checking mio v0.6.22 [INFO] [stderr] Checking naga v0.2.0 [INFO] [stderr] Checking gfx-backend-empty v0.6.0 [INFO] [stderr] Checking gfx-descriptor v0.2.0 [INFO] [stderr] Checking gfx-memory v0.2.0 [INFO] [stderr] Checking parking_lot_core v0.7.2 [INFO] [stderr] Checking parking_lot_core v0.8.0 [INFO] [stderr] Checking gfx-backend-vulkan v0.6.1 [INFO] [stderr] Checking rhai v0.18.3 [INFO] [stderr] Checking parking_lot v0.10.2 [INFO] [stderr] Checking bevy_math v0.1.3 (https://github.com/insrcd/bevy.git#3362cc44) [INFO] [stderr] Checking hexasphere v1.0.0 [INFO] [stderr] Checking parking_lot v0.11.0 [INFO] [stderr] Checking sled v0.34.3 [INFO] [stderr] Checking mio-extras v2.0.6 [INFO] [stderr] Checking notify v5.0.0-pre.3 [INFO] [stderr] Compiling proc-macro-crate v0.1.5 [INFO] [stderr] Checking gltf-json v0.15.2 [INFO] [stderr] Compiling bevy_hecs_macros v0.1.3 (https://github.com/insrcd/bevy.git#3362cc44) [INFO] [stderr] Compiling bevy_derive v0.1.3 (https://github.com/insrcd/bevy.git#3362cc44) [INFO] [stderr] Compiling bevy_property_derive v0.1.3 (https://github.com/insrcd/bevy.git#3362cc44) [INFO] [stderr] Checking wgpu-core v0.6.3 [INFO] [stderr] Checking bevy_hecs v0.1.3 (https://github.com/insrcd/bevy.git#3362cc44) [INFO] [stderr] Checking bevy_ecs v0.1.3 (https://github.com/insrcd/bevy.git#3362cc44) [INFO] [stderr] Checking gltf v0.15.2 [INFO] [stderr] Checking wgpu v0.6.0 [INFO] [stderr] Checking bevy_app v0.1.3 (https://github.com/insrcd/bevy.git#3362cc44) [INFO] [stderr] Checking bevy_property v0.1.3 (https://github.com/insrcd/bevy.git#3362cc44) [INFO] [stderr] Checking bevy_window v0.1.3 (https://github.com/insrcd/bevy.git#3362cc44) [INFO] [stderr] Checking bevy_input v0.1.3 (https://github.com/insrcd/bevy.git#3362cc44) [INFO] [stderr] Checking bevy_winit v0.1.3 (https://github.com/insrcd/bevy.git#3362cc44) [INFO] [stderr] Checking bevy_type_registry v0.1.3 (https://github.com/insrcd/bevy.git#3362cc44) [INFO] [stderr] Checking bevy_asset v0.1.3 (https://github.com/insrcd/bevy.git#3362cc44) [INFO] [stderr] Checking bevy_core v0.1.3 (https://github.com/insrcd/bevy.git#3362cc44) [INFO] [stderr] Checking bevy_transform v0.1.3 (https://github.com/insrcd/bevy.git#3362cc44) [INFO] [stderr] Checking bevy_diagnostic v0.1.3 (https://github.com/insrcd/bevy.git#3362cc44) [INFO] [stderr] Checking bevy_scene v0.1.3 (https://github.com/insrcd/bevy.git#3362cc44) [INFO] [stderr] Checking bevy_audio v0.1.3 (https://github.com/insrcd/bevy.git#3362cc44) [INFO] [stderr] Checking bevy_render v0.1.3 (https://github.com/insrcd/bevy.git#3362cc44) [INFO] [stdout] error: encountered diff marker [INFO] [stdout] --> /opt/rustwide/cargo-home/git/checkouts/bevy-6fc061e170594249/3362cc4/crates/bevy_render/src/render_graph/nodes/render_resources_node.rs:204:1 [INFO] [stdout] | [INFO] [stdout] 204 | <<<<<<< HEAD [INFO] [stdout] | ^^^^^^^ between this marker and `=======` is the code that we're merging into [INFO] [stdout] ... [INFO] [stdout] 225 | ======= [INFO] [stdout] | ------- between this marker and `>>>>>>>` is the incoming code [INFO] [stdout] 226 | >>>>>>> 25f62f7250a0d750068dc32533b9433f7985af98 [INFO] [stdout] | ^^^^^^^ this marker concludes the conflict region [INFO] [stdout] | [INFO] [stdout] = note: conflict markers indicate that a merge was started but could not be completed due to merge conflicts [INFO] [stdout] to resolve a conflict, keep only the code you want and then delete the lines containing conflict markers [INFO] [stdout] = help: if you're having merge conflicts after pulling new code: [INFO] [stdout] the top section is the code you already had and the bottom section is the remote code [INFO] [stdout] if you're in the middle of a rebase: [INFO] [stdout] the top section is the code being rebased onto and the bottom section is the code coming from the current commit being rebased [INFO] [stdout] = note: for an explanation on these markers from the `git` documentation: [INFO] [stdout] visit [INFO] [stdout] [INFO] [stdout] [INFO] [stderr] error: could not compile `bevy_render` (lib) due to 1 previous error [INFO] running `Command { std: "docker" "inspect" "af94dd718cbbb7565e5675ba1cd0f4ce26483f7cf3b66e57bfda60b51e806023", kill_on_drop: false }` [INFO] running `Command { std: "docker" "rm" "-f" "af94dd718cbbb7565e5675ba1cd0f4ce26483f7cf3b66e57bfda60b51e806023", kill_on_drop: false }` [INFO] [stdout] af94dd718cbbb7565e5675ba1cd0f4ce26483f7cf3b66e57bfda60b51e806023