Skip to content

W
windbot
You need to sign in or sign up before continuing.

Merge branch 'master' of github.com:moecube/windbot

4 jobs for master in 37 seconds (queued for 1 second)
1cc4c23b 1cc4c23be604e60520f30370b61fa712408bb5d2
No related merge requests found.
Status Job ID Name Coverage
  Build
failed #83830
linux
build

00:00:36

failed #83831
docker
docker

00:00:35

 
  Deploy
skipped #83833
docker
deploy_docker
skipped #83832
linux
upload_to_minio
 
Name Stage Failure
failed
docker Build 
	Game/AI/DefaultExecutor.cs(1258,1): error CS8300: Merge conflict marker encountered

	 0 Warning(s)
	 3 Error(s)

Time Elapsed 00:00:03.3132490
The command '/bin/sh -c xbuild /p:Configuration=Release /p:TargetFrameworkVersion=v4.5 /p:OutDir=/windbot/' returned a non-zero code: 1
Cleaning up file based variables
ERROR: Job failed: exit code 1
failed
build Build 
  /builds/nanahira/windbot/Game/AI/DefaultExecutor.cs(1209,1): error CS8300: Merge conflict marker encountered [/builds/nanahira/windbot/WindBot.csproj]
  /builds/nanahira/windbot/Game/AI/DefaultExecutor.cs(1258,1): error CS8300: Merge conflict marker encountered [/builds/nanahira/windbot/WindBot.csproj]

    1 Warning(s)
    3 Error(s)

Time Elapsed 00:00:03.70
Cleaning up file based variables
ERROR: Job failed: exit code 1