Silver's Simple Site - Projects - Open Rails

Open Rails Code Bot started at 2021-10-18 09:36:09Z
GitHub organisation: openrails
GitHub team:         development-team
GitHub repository:   openrails
GitHub base branch:  master
GitHub merge branch: unstable
Team members (13):
  Sharpe49
  twpol
  cjakeman
  pzgulyas
  YoRyan
  perpetualKid
  strawberryfield
  cesarBLG
  peternewell
  Csantucci
  wjcurrey
  markus-GE
  mbm-OR
Open pull requests (4):
  #57 Ensure that build fails when tests fail to run
    By:     twpol
    Branch: bugfix/net4-test-runner
    Labels: not-for-unstable
    Allowed to auto-merge? False
  #480 Blueprint https://blueprints.launchpad.net/or/+spec/digital-alignment-in-3dcabs
    By:     Csantucci
    Branch: 3dCab-digitals-alignment
    Labels: enhancement
    Allowed to auto-merge? True
  #503 Update derailment functionality
    By:     peternewell
    Branch: derailment#2
    Labels: enhancement
    Allowed to auto-merge? True
  #510 Add performance monitoring for diesel mechanic locomotives and new parameters
    By:     peternewell
    Branch: diesel-mechanic#1
    Labels: enhancement
    Allowed to auto-merge? True
Pull requests suitable for auto-merging (3):
  #480 Blueprint https://blueprints.launchpad.net/or/+spec/digital-alignment-in-3dcabs
  #503 Update derailment functionality
  #510 Add performance monitoring for diesel mechanic locomotives and new parameters
Preparing repository...
  > git --no-pager fetch --update-head-ok
  ! From github.com:openrails/openrails
  !    8a7c2af9a..780b0e8c9  refs/pull/503/head  -> refs/pull/503/head
  !  + 77a38690f...13b9a5890 refs/pull/503/merge -> refs/pull/503/merge  (forced update)
  > git --no-pager reset --hard
  < HEAD is now at 4cc643454 Automatic merge of T1.4-rc6-12-gfab59f576 and 9 pull requests
  > git --no-pager clean --force -d -x
  > git --no-pager checkout --quiet --detach 98f46f681a320243bdb45dfffb8636d6e10d152c
Merging #480 Blueprint https://blueprints.launchpad.net/or/+spec/digital-alignment-in-3dcabs...
  > git --no-pager merge --quiet --no-edit --no-ff 6bc94a99914af963941ee09fca2695667282ad6b
  < Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs
Merging #503 Update derailment functionality...
  > git --no-pager merge --quiet --no-edit --no-ff 780b0e8c99222653fb7bd19d32245db51465c4be
  < Auto-merging Source/RunActivity/Viewer3D/Popups/TrainDrivingWindow.cs
  < Auto-merging Source/RunActivity/Viewer3D/Popups/HUDWindow.cs
  < Auto-merging Source/Orts.Parsers.Msts/STFReader.cs
Merging #510 Add performance monitoring for diesel mechanic locomotives and new parameters...
  > git --no-pager merge --quiet --no-edit --no-ff d4d3256c63e1d2f73ad64a8138c85f54c3dc0111
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/DieselEngine.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
Pull requests successfully auto-merged (3):
  #480 Blueprint https://blueprints.launchpad.net/or/+spec/digital-alignment-in-3dcabs
  #503 Update derailment functionality
  #510 Add performance monitoring for diesel mechanic locomotives and new parameters
Pull requests not auto-merged (0):
Creating merge commit...
  > git --no-pager branch -f unstable 11f7024e90f99e70e5b1e0514013fd636bf2c738
  > git --no-pager checkout --quiet unstable
  > git --no-pager push origin unstable
  ! To github.com:openrails/openrails.git
  !    4cc643454..11f7024e9  unstable -> unstable
Pushed changes into merge branch:
  Version: U2021.10.18-0936
  Message: Automatic merge of T1.4-rc6-28-g98f46f681 and 3 pull requests
Open Rails Code Bot finished at 2021-10-18 09:36:21Z