Silver's Simple Site - Projects - Open Rails

Open Rails Code Bot started at 2021-04-21 16:06:29Z
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 (9):
  #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
  #79 Update version calculation for new unstable versions
    By:     twpol
    Branch: feature/unstable-version-numbers
    Labels: 
    Allowed to auto-merge? True
  #369 Copies ExtClock from OR New Year MG
    By:     cjakeman
    Branch: external-clocks
    Labels: enhancement help wanted
    Allowed to auto-merge? True
  #384 ETCS Driver Machine Interface
    By:     cesarBLG
    Branch: etcs-dmi-display
    Labels: enhancement
    Allowed to auto-merge? True
  #389 Russian Localization Stage III
    By:     Weter-ORTS
    Branch: Weter-ORTS-patch-1
    Labels: locales
    Allowed to auto-merge? False
  #391 Animated wipers for 2D cabs, see http://www.elvastower.com/forums/index.php?/topic/34604-2d-cabs-wipers-animation/
    By:     Csantucci
    Branch: 2D-wiper-animation
    Labels: enhancement
    Allowed to auto-merge? True
  #392 Blueprint https://blueprints.launchpad.net/or/+spec/trainset-elevator Trainset elevator
    By:     Csantucci
    Branch: elevator
    Labels: enhancement
    Allowed to auto-merge? True
  #396 Fix issues with adhesion resume
    By:     peternewell
    Branch: diesel-adhesion
    Labels: bug
    Allowed to auto-merge? True
  #399 Power supply package
    By:     Sharpe49
    Branch: power-supply
    Labels: enhancement
    Allowed to auto-merge? True
Pull requests suitable for auto-merging (7):
  #79 Update version calculation for new unstable versions
  #369 Copies ExtClock from OR New Year MG
  #384 ETCS Driver Machine Interface
  #391 Animated wipers for 2D cabs, see http://www.elvastower.com/forums/index.php?/topic/34604-2d-cabs-wipers-animation/
  #392 Blueprint https://blueprints.launchpad.net/or/+spec/trainset-elevator Trainset elevator
  #396 Fix issues with adhesion resume
  #399 Power supply package
Preparing repository...
  > git --no-pager fetch --update-head-ok
  > git --no-pager reset --hard
  < HEAD is now at 5f64422bc Automatic merge of X1.3.1-345-gf497b6b6d and 6 pull requests
  > git --no-pager clean --force -d -x
  > git --no-pager checkout --quiet --detach f497b6b6da69357020c92a9e214b379c5d98f792
Merging #79 Update version calculation for new unstable versions...
  > git --no-pager merge --quiet --no-edit --no-ff 7d9f14be82ec3bfc3c5ded65bc3503490d96083c
  < Auto-merging Build.cmd
Merging #369 Copies ExtClock from OR New Year MG...
  > git --no-pager merge --quiet --no-edit --no-ff 9b4e70da5fcc0a1a1eba0b75a4602b6fe60635c8
  < Auto-merging Source/RunActivity/Viewer3D/Shapes.cs
  < Auto-merging Source/Menu/Menu.csproj
Merging #384 ETCS Driver Machine Interface...
  > git --no-pager merge --quiet --no-edit --no-ff a90119a17ce98e7b35b92641e9c862a8d33debd2
  < Auto-merging Source/RunActivity/Viewer3D/Viewer.cs
  < Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs
  < Auto-merging Source/RunActivity/RunActivity.csproj
  < Auto-merging Source/Orts.Formats.Msts/CabViewFile.cs
  < Auto-merging Source/Documentation/Manual/options.rst
Merging #391 Animated wipers for 2D cabs, see http://www.elvastower.com/forums/index.php?/topic/34604-2d-cabs-wipers-animation/...
  > git --no-pager merge --quiet --no-edit --no-ff b509983713de0c7ea01e0b72006a9c44e43c8bb1
  < Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs
  < Auto-merging Source/Orts.Formats.Msts/CabViewFile.cs
Merging #392 Blueprint https://blueprints.launchpad.net/or/+spec/trainset-elevator Trainset elevator...
  > git --no-pager merge --quiet --no-edit --no-ff 6167a5d856e27a30437d8a1bad450ee73917813e
  < Auto-merging Source/RunActivity/Viewer3D/Shapes.cs
  < Auto-merging Source/Documentation/Manual/features-route.rst
Merging #396 Fix issues with adhesion resume...
  > git --no-pager merge --quiet --no-edit --no-ff 5f81fbc47e55d9350084748e4b66633ecb929bf4
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
Merging #399 Power supply package...
  > git --no-pager merge --quiet --no-edit --no-ff da54ff1e7a46fab544696d0a60e2867dcb695442
  < Auto-merging Source/RunActivity/Viewer3D/Viewer.cs
  < Auto-merging Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/TrainControlSystem.cs
  < Removing Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/AbstractPowerSupply.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
  < CONFLICT (content): Merge conflict in Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
  < Auto-merging Source/Orts.Simulation/Orts.Simulation.csproj
  < Auto-merging Source/Orts.Simulation/Common/Scripting/TrainControlSystem.cs
  < Removing Source/Orts.Simulation/Common/Scripting/PowerSupply/AbstractPowerSupply.cs
  < Auto-merging Source/Orts.Formats.Msts/CabViewFile.cs
  < CONFLICT (content): Merge conflict in Source/Orts.Formats.Msts/CabViewFile.cs
  < Auto-merging Source/Documentation/Manual/features-rollingstock.rst
  < CONFLICT (content): Merge conflict in Source/Documentation/Manual/features-rollingstock.rst
  < Auto-merging Source/Documentation/Manual/cabs.rst
  < Automatic merge failed; fix conflicts and then commit the result.
  > git --no-pager reset --hard
  < HEAD is now at 30706e432 Merge commit '5f81fbc47e55d9350084748e4b66633ecb929bf4' into HEAD
  > git --no-pager clean --force -d -x
  Error: git merge --quiet --no-edit --no-ff da54ff1e7a46fab544696d0a60e2867dcb695442 failed: 1
Pull requests successfully auto-merged (6):
  #79 Update version calculation for new unstable versions
  #369 Copies ExtClock from OR New Year MG
  #384 ETCS Driver Machine Interface
  #391 Animated wipers for 2D cabs, see http://www.elvastower.com/forums/index.php?/topic/34604-2d-cabs-wipers-animation/
  #392 Blueprint https://blueprints.launchpad.net/or/+spec/trainset-elevator Trainset elevator
  #396 Fix issues with adhesion resume
Pull requests not auto-merged (1):
  #399 Power supply package
No changes to push into merge branch
  > git --no-pager checkout --quiet unstable
Open Rails Code Bot finished at 2021-04-21 16:07:10Z