Silver's Simple Site - Projects - Open Rails

Open Rails Code Bot started at 2021-03-01 15:06:20Z
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 (15):
  #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
  #297 Timetable trains shown on a map v2
    By:     cjakeman
    Branch: timetable-window2
    Labels: enhancement
    Allowed to auto-merge? True
  #306 Write back to the settings store on quit
    By:     YoRyan
    Branch: save-ingame-settings
    Labels: enhancement
    Allowed to auto-merge? True
  #310 Russian translation update
    By:     Weter-ORTS
    Branch: master
    Labels: for-unstable locales
    Allowed to auto-merge? True
  #340 Create C# signalling scripting interface
    By:     cesarBLG
    Branch: csharp-signal-script
    Labels: enhancement
    Allowed to auto-merge? True
  #357 Correct issues with diesel power not being applied correctly
    By:     peternewell
    Branch: diesel-motiveforce
    Labels: bug
    Allowed to auto-merge? True
  #360 Bug fix for https://bugs.launchpad.net/or/+bug/1916525. TimeTable mode, #settings for storage area, fails.
    By:     mbm-OR
    Branch: bugfix/Timetable-settings-storage-fails-empty-field
    Labels: bug
    Allowed to auto-merge? True
  #362 Correct null value bug
    By:     peternewell
    Branch: vacuum-bug
    Labels: bug
    Allowed to auto-merge? True
  #363 Fix build warnings in the manual text
    By:     YoRyan
    Branch: manual-fixes
    Labels: documentation
    Allowed to auto-merge? True
  #364 Added new items since v1.3
    By:     cjakeman
    Branch: manual-changes-since-last-version
    Labels: documentation
    Allowed to auto-merge? True
  #365 Update AI horn blow sections in the manual
    By:     YoRyan
    Branch: manual-horncrossings
    Labels: documentation
    Allowed to auto-merge? True
  #366 added 2 more items to Learn > Activities
    By:     cjakeman
    Branch: website-activities2
    Labels: website
    Allowed to auto-merge? True
  #367 Resolve Monogame build warnings
    By:     YoRyan
    Branch: fix-build-warnings
    Labels: refactoring
    Allowed to auto-merge? True
  #368 Menu options help
    By:     cjakeman
    Branch: menu-options-help
    Labels: documentation enhancement
    Allowed to auto-merge? True
Pull requests suitable for auto-merging (14):
  #79 Update version calculation for new unstable versions
  #297 Timetable trains shown on a map v2
  #306 Write back to the settings store on quit
  #310 Russian translation update
  #340 Create C# signalling scripting interface
  #357 Correct issues with diesel power not being applied correctly
  #360 Bug fix for https://bugs.launchpad.net/or/+bug/1916525. TimeTable mode, #settings for storage area, fails.
  #362 Correct null value bug
  #363 Fix build warnings in the manual text
  #364 Added new items since v1.3
  #365 Update AI horn blow sections in the manual
  #366 added 2 more items to Learn > Activities
  #367 Resolve Monogame build warnings
  #368 Menu options help
Preparing repository...
  > git --no-pager fetch --update-head-ok
  > git --no-pager reset --hard
  < HEAD is now at 2581360cc Automatic merge of X1.3.1-308-g9e22e0ed2 and 12 pull requests
  > git --no-pager clean --force -d -x
  > git --no-pager checkout --quiet --detach 9e22e0ed239ed10d878a1636feed510d9dee084e
Merging #79 Update version calculation for new unstable versions...
  > git --no-pager merge --quiet --no-edit --no-ff 7d9f14be82ec3bfc3c5ded65bc3503490d96083c
  < Auto-merging Build.cmd
Merging #297 Timetable trains shown on a map v2...
  > git --no-pager merge --quiet --no-edit --no-ff f8c95d314768ce5538924a3c765732deabacb011
Merging #306 Write back to the settings store on quit...
  > git --no-pager merge --quiet --no-edit --no-ff ee05a60980adbd2cede59d33431718faba3b10ce
Merging #310 Russian translation update...
  > git --no-pager merge --quiet --no-edit --no-ff c80ad62a35b6a6a5d73c54a1c0a5ce36da1cb07e
Merging #340 Create C# signalling scripting interface...
  > git --no-pager merge --quiet --no-edit --no-ff eebb3ab58380955a289910214af12f96c88cd0a7
  < Auto-merging Source/RunActivity/Viewer3D/Debugging/DebugViewerForm.cs
  < Auto-merging Source/Documentation/Manual/operation.rst
Merging #357 Correct issues with diesel power not being applied correctly...
  > git --no-pager merge --quiet --no-edit --no-ff c3aafe86932dcf146cfd589bf6aadc57ea7c2333
  < Auto-merging Source/RunActivity/Viewer3D/Popups/HUDWindow.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSSteamLocomotive.cs
  < Auto-merging Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
Merging #360 Bug fix for https://bugs.launchpad.net/or/+bug/1916525. TimeTable mode, #settings for storage area, fails....
  > git --no-pager merge --quiet --no-edit --no-ff 9b575ad690c91db3afe519cefdd28b3b13e3d594
Merging #362 Correct null value bug...
  > git --no-pager merge --quiet --no-edit --no-ff b0dabe742ce38abc51c6407aacb29d8dc7366fe1
Merging #363 Fix build warnings in the manual text...
  > git --no-pager merge --quiet --no-edit --no-ff 790aa29db62490286b8cb130d20e5ab23cc08153
  < Auto-merging Source/Documentation/Manual/features-rollingstock.rst
  < Auto-merging Source/Documentation/Manual/appendices.rst
  < CONFLICT (content): Merge conflict in Source/Documentation/Manual/appendices.rst
  < Automatic merge failed; fix conflicts and then commit the result.
  > git --no-pager reset --hard
  < HEAD is now at 97df4bce5 Merge commit 'b0dabe742ce38abc51c6407aacb29d8dc7366fe1' into HEAD
  > git --no-pager clean --force -d -x
  Error: git merge --quiet --no-edit --no-ff 790aa29db62490286b8cb130d20e5ab23cc08153 failed: 1
Merging #364 Added new items since v1.3...
  > git --no-pager merge --quiet --no-edit --no-ff f9d65a40ca72ddfb2d302c3571860f06460f2941
Merging #365 Update AI horn blow sections in the manual...
  > git --no-pager merge --quiet --no-edit --no-ff 5d134a08d7df1b0df26b5ffb5b279e0759464052
  < Auto-merging Source/Documentation/Manual/operation.rst
Merging #366 added 2 more items to Learn > Activities...
  > git --no-pager merge --quiet --no-edit --no-ff 83eef9368c75e04367dacb80f7a355da532ce5ea
Merging #367 Resolve Monogame build warnings...
  > git --no-pager merge --quiet --no-edit --no-ff 7c150623af0e984b46cc448d4f5dc58cb1ea2bd0
  < Auto-merging Source/RunActivity/Viewer3D/Sky.cs
Merging #368 Menu options help...
  > git --no-pager merge --quiet --no-edit --no-ff 8dedd202f1bdd8009b8d1fc40ec3cd7d858cb1bc
  < Auto-merging Source/Menu/Options.cs
  < Auto-merging Source/Menu/Options.Designer.cs
  < CONFLICT (content): Merge conflict in Source/Menu/Options.Designer.cs
  < Automatic merge failed; fix conflicts and then commit the result.
  > git --no-pager reset --hard
  < HEAD is now at 40c35c3a0 Merge commit '7c150623af0e984b46cc448d4f5dc58cb1ea2bd0' into HEAD
  > git --no-pager clean --force -d -x
  Error: git merge --quiet --no-edit --no-ff 8dedd202f1bdd8009b8d1fc40ec3cd7d858cb1bc failed: 1
Pull requests successfully auto-merged (12):
  #79 Update version calculation for new unstable versions
  #297 Timetable trains shown on a map v2
  #306 Write back to the settings store on quit
  #310 Russian translation update
  #340 Create C# signalling scripting interface
  #357 Correct issues with diesel power not being applied correctly
  #360 Bug fix for https://bugs.launchpad.net/or/+bug/1916525. TimeTable mode, #settings for storage area, fails.
  #362 Correct null value bug
  #364 Added new items since v1.3
  #365 Update AI horn blow sections in the manual
  #366 added 2 more items to Learn > Activities
  #367 Resolve Monogame build warnings
Pull requests not auto-merged (2):
  #363 Fix build warnings in the manual text
  #368 Menu options help
No changes to push into merge branch
  > git --no-pager checkout --quiet unstable
Open Rails Code Bot finished at 2021-03-01 15:06:30Z