AliPhysics
AliPhysics copied to clipboard
alisw
Code for beauty analysis in pp 13TeV
1a0c1a04b1ac56dffbe49e3618441c8fedeb5005: approval required: 1 of @fprino (Francesco Prino), @qgp (Jochen Klein), @cterrevo (Cristina Terrevoli), @davidrohr (David Rohr), @fgrosa (Fabrizio Grosa), @shahor02 (Ruben Shahoyan), @adubla (Andrea Dubla), @arossi81 (Andrea Rossi), @jezwilkinson (Jeremy Wilkinson), @sashingo (Shingo Sakai), @fcolamar (Fabio Colamaria), @jgrosseo (Jan Fiete Grosse-Oetringhaus)
Comment with +1 to approve and allow automatic merging,or with +test to run tests only. Please comment on the pull request: click here and comment at the bottom of the page.
1a0c1a04b1ac56dffbe49e3618441c8fedeb5005: testing approved: will not be automatically merged; starting testing. If testing succeeds, merging will require further approval from 1 of @fprino (Francesco Prino), @qgp (Jochen Klein), @cterrevo (Cristina Terrevoli), @davidrohr (David Rohr), @fgrosa (Fabrizio Grosa), @shahor02 (Ruben Shahoyan), @adubla (Andrea Dubla), @arossi81 (Andrea Rossi), @jezwilkinson (Jeremy Wilkinson), @sashingo (Shingo Sakai), @fcolamar (Fabio Colamaria), @jgrosseo (Jan Fiete Grosse-Oetringhaus)
Error while checking build/AliPhysics/root6 for 1a0c1a04b1ac56dffbe49e3618441c8fedeb5005 at 2021-08-24 09:52:
sw/BUILD/AliPhysics-latest/log
Start 98: load_library_PWGPPpid
93/116 Test #41: load_library_PWGCFChaoticity ..................... Passed 1.03 sec
Start 46: load_library_PWGCFunicor
94/116 Test #2: load_library_EventMixing ......................... Passed 1.09 sec
Start 44: load_library_PWGCFHCascadeAnalysis
95/116 Test #109: load_library_PWGUDFP ............................. Passed 1.04 sec
Start 50: load_library_PWGCFKPAnalysis
96/116 Test #71: load_library_PWGDQdimuons ........................ Passed 1.03 sec
Start 113: load_library_PWGMMMult
97/116 Test #53: load_library_PWGCFFEMTOSCOPYAOD .................. Passed 1.05 sec
Start 7: load_library_Tender
98/116 Test #72: load_library_PWGHFbase ........................... Passed 1.03 sec
Start 51: load_library_PWGCFK0pAnalysis
99/116 Test #107: load_library_PWGUDbase ........................... Passed 1.07 sec
Start 115: load_library_ML
100/116 Test #46: load_library_PWGCFunicor ......................... Passed 1.20 sec
Start 112: load_library_PWGMMLumi
101/116 Test #98: load_library_PWGPPpid ............................ Passed 1.22 sec
Start 93: load_library_PWGLFthermalfits
102/116 Test #44: load_library_PWGCFHCascadeAnalysis ............... Passed 1.14 sec
Start 67: load_library_PWGDQbase
103/116 Test #113: load_library_PWGMMMult ........................... Passed 1.06 sec
Start 100: load_library_PWGPPevcharQn
104/116 Test #7: load_library_Tender .............................. Passed 1.06 sec
Start 17: load_library_PWGGlauber
105/116 Test #50: load_library_PWGCFKPAnalysis ..................... Passed 1.35 sec
Start 65: load_library_PWGGAUtils
106/116 Test #115: load_library_ML .................................. Passed 0.93 sec
Start 54: load_library_PWGCFflowBW
107/116 Test #51: load_library_PWGCFK0pAnalysis .................... Passed 1.00 sec
Start 14: load_library_PWGEMCALtriggerPart
108/116 Test #100: load_library_PWGPPevcharQn ....................... Passed 0.77 sec
Start 75: load_library_vertexingHFTMVA
109/116 Test #93: load_library_PWGLFthermalfits .................... Passed 0.95 sec
110/116 Test #112: load_library_PWGMMLumi ........................... Passed 1.09 sec
111/116 Test #17: load_library_PWGGlauber .......................... Passed 0.90 sec
112/116 Test #67: load_library_PWGDQbase ........................... Passed 1.07 sec
113/116 Test #65: load_library_PWGGAUtils .......................... Passed 0.85 sec
114/116 Test #54: load_library_PWGCFflowBW ......................... Passed 0.84 sec
115/116 Test #14: load_library_PWGEMCALtriggerPart ................. Passed 0.83 sec
116/116 Test #75: load_library_vertexingHFTMVA ..................... Passed 0.76 sec
98% tests passed, 2 tests failed out of 116
Total Test time (real) = 22.09 sec
The following tests FAILED:
73 - load_library_PWGHFcorrelationHF (Failed)
74 - load_library_PWGHFhfe (Failed)
Full log here.
Error while checking build/AliPhysics/release for 1a0c1a04b1ac56dffbe49e3618441c8fedeb5005 at 2021-08-24 09:56:
sw/BUILD/AliPhysics-latest/log
Start 97: load_library_PWGPPpid
90/113 Test #94: load_library_PWGLFppvsmult ....................... Passed 0.79 sec
Start 98: load_library_PWGPPevchar
91/113 Test #93: load_library_PWGLFtotEt .......................... Passed 0.87 sec
Start 99: load_library_PWGPPevcharQn
92/113 Test #97: load_library_PWGPPpid ............................ Passed 0.54 sec
Start 100: load_library_PWGPPevcharQnInterface
93/113 Test #89: load_library_PWGLFspectra ........................ Passed 1.75 sec
Start 101: load_library_PWGPPMUONdep
94/113 Test #90: load_library_PWGLFspectraJET ..................... Passed 1.64 sec
Start 102: load_library_PWGPPMUONlite
95/113 Test #96: load_library_PWGLFcommonutils .................... Passed 0.97 sec
Start 103: load_library_PWGPPEMCAL
96/113 Test #99: load_library_PWGPPevcharQn ....................... Passed 0.37 sec
Start 104: load_library_PWGPPAlignment
97/113 Test #91: load_library_PWGLFSTRANGENESS .................... Passed 1.41 sec
Start 105: load_library_PWGPP
98/113 Test #95: load_library_PWGLFnuclex ......................... Passed 1.06 sec
Start 106: load_library_PWGUDbase
99/113 Test #98: load_library_PWGPPevchar ......................... Passed 0.67 sec
Start 107: load_library_PWGUDdiffractive
100/113 Test #104: load_library_PWGPPAlignment ...................... Passed 0.67 sec
Start 108: load_library_PWGUDFP
101/113 Test #103: load_library_PWGPPEMCAL .......................... Passed 0.70 sec
Start 109: load_library_PWGUDselectors
102/113 Test #102: load_library_PWGPPMUONlite ....................... Passed 0.85 sec
Start 110: load_library_PWGUDupc
103/113 Test #106: load_library_PWGUDbase ........................... Passed 0.75 sec
Start 111: load_library_PWGMMLumi
104/113 Test #100: load_library_PWGPPevcharQnInterface .............. Passed 0.98 sec
Start 112: load_library_PWGMMMult
105/113 Test #101: load_library_PWGPPMUONdep ........................ Passed 0.95 sec
Start 113: load_library_PWGMMue
106/113 Test #105: load_library_PWGPP ............................... Passed 1.07 sec
107/113 Test #108: load_library_PWGUDFP ............................. Passed 0.60 sec
108/113 Test #107: load_library_PWGUDdiffractive .................... Passed 1.08 sec
109/113 Test #111: load_library_PWGMMLumi ........................... Passed 0.57 sec
110/113 Test #109: load_library_PWGUDselectors ...................... Passed 0.72 sec
111/113 Test #112: load_library_PWGMMMult ........................... Passed 0.58 sec
112/113 Test #113: load_library_PWGMMue ............................. Passed 0.70 sec
113/113 Test #110: load_library_PWGUDupc ............................ Passed 0.82 sec
98% tests passed, 2 tests failed out of 113
Total Test time (real) = 14.14 sec
The following tests FAILED:
73 - load_library_PWGHFcorrelationHF (Failed)
74 - load_library_PWGHFhfe (Failed)
Full log here.
7fa77e6f4fe6b5d9bf2866f501ba9cf4708aa867: approval required: 1 of @fprino (Francesco Prino), @qgp (Jochen Klein), @cterrevo (Cristina Terrevoli), @davidrohr (David Rohr), @fgrosa (Fabrizio Grosa), @shahor02 (Ruben Shahoyan), @adubla (Andrea Dubla), @arossi81 (Andrea Rossi), @jezwilkinson (Jeremy Wilkinson), @sashingo (Shingo Sakai), @fcolamar (Fabio Colamaria), @jgrosseo (Jan Fiete Grosse-Oetringhaus)
Comment with +1 to approve and allow automatic merging,or with +test to run tests only. Please comment on the pull request: click here and comment at the bottom of the page.
7fa77e6f4fe6b5d9bf2866f501ba9cf4708aa867: testing approved: will not be automatically merged; starting testing. If testing succeeds, merging will require further approval from 1 of @fprino (Francesco Prino), @qgp (Jochen Klein), @cterrevo (Cristina Terrevoli), @davidrohr (David Rohr), @fgrosa (Fabrizio Grosa), @shahor02 (Ruben Shahoyan), @adubla (Andrea Dubla), @arossi81 (Andrea Rossi), @jezwilkinson (Jeremy Wilkinson), @sashingo (Shingo Sakai), @fcolamar (Fabio Colamaria), @jgrosseo (Jan Fiete Grosse-Oetringhaus)
04db27a35b42d003ab0fcfa107f8b5c0e42ba9cd: approval required: 1 of @fprino (Francesco Prino), @qgp (Jochen Klein), @cterrevo (Cristina Terrevoli), @davidrohr (David Rohr), @fgrosa (Fabrizio Grosa), @shahor02 (Ruben Shahoyan), @adubla (Andrea Dubla), @arossi81 (Andrea Rossi), @jezwilkinson (Jeremy Wilkinson), @sashingo (Shingo Sakai), @fcolamar (Fabio Colamaria), @jgrosseo (Jan Fiete Grosse-Oetringhaus)
Comment with +1 to approve and allow automatic merging,or with +test to run tests only. Please comment on the pull request: click here and comment at the bottom of the page.
04db27a35b42d003ab0fcfa107f8b5c0e42ba9cd: testing approved: will not be automatically merged; starting testing. If testing succeeds, merging will require further approval from 1 of @fprino (Francesco Prino), @qgp (Jochen Klein), @cterrevo (Cristina Terrevoli), @davidrohr (David Rohr), @fgrosa (Fabrizio Grosa), @shahor02 (Ruben Shahoyan), @adubla (Andrea Dubla), @arossi81 (Andrea Rossi), @jezwilkinson (Jeremy Wilkinson), @sashingo (Shingo Sakai), @fcolamar (Fabio Colamaria), @jgrosseo (Jan Fiete Grosse-Oetringhaus)
Error while checking build/AliPhysics/release for 7fa77e6f4fe6b5d9bf2866f501ba9cf4708aa867 at 2021-08-24 11:09:
sw/BUILD/AliPhysics-latest/log
Start 97: load_library_PWGPPpid
90/113 Test #93: load_library_PWGLFtotEt .......................... Passed 0.63 sec
Start 98: load_library_PWGPPevchar
91/113 Test #90: load_library_PWGLFspectraJET ..................... Passed 0.94 sec
Start 99: load_library_PWGPPevcharQn
92/113 Test #96: load_library_PWGLFcommonutils .................... Passed 0.49 sec
Start 100: load_library_PWGPPevcharQnInterface
93/113 Test #94: load_library_PWGLFppvsmult ....................... Passed 0.70 sec
Start 101: load_library_PWGPPMUONdep
94/113 Test #97: load_library_PWGPPpid ............................ Passed 0.44 sec
Start 102: load_library_PWGPPMUONlite
95/113 Test #89: load_library_PWGLFspectra ........................ Passed 1.21 sec
Start 103: load_library_PWGPPEMCAL
96/113 Test #99: load_library_PWGPPevcharQn ....................... Passed 0.31 sec
Start 104: load_library_PWGPPAlignment
97/113 Test #91: load_library_PWGLFSTRANGENESS .................... Passed 1.19 sec
Start 105: load_library_PWGPP
98/113 Test #95: load_library_PWGLFnuclex ......................... Passed 0.99 sec
Start 106: load_library_PWGUDbase
99/113 Test #98: load_library_PWGPPevchar ......................... Passed 0.63 sec
Start 107: load_library_PWGUDdiffractive
100/113 Test #102: load_library_PWGPPMUONlite ....................... Passed 0.54 sec
Start 108: load_library_PWGUDFP
101/113 Test #100: load_library_PWGPPevcharQnInterface .............. Passed 0.66 sec
Start 109: load_library_PWGUDselectors
102/113 Test #101: load_library_PWGPPMUONdep ........................ Passed 0.74 sec
Start 110: load_library_PWGUDupc
103/113 Test #103: load_library_PWGPPEMCAL .......................... Passed 0.59 sec
Start 111: load_library_PWGMMLumi
104/113 Test #104: load_library_PWGPPAlignment ...................... Passed 0.58 sec
Start 112: load_library_PWGMMMult
105/113 Test #108: load_library_PWGUDFP ............................. Passed 0.43 sec
Start 113: load_library_PWGMMue
106/113 Test #106: load_library_PWGUDbase ........................... Passed 0.69 sec
107/113 Test #111: load_library_PWGMMLumi ........................... Passed 0.32 sec
108/113 Test #112: load_library_PWGMMMult ........................... Passed 0.43 sec
109/113 Test #105: load_library_PWGPP ............................... Passed 1.00 sec
110/113 Test #109: load_library_PWGUDselectors ...................... Passed 0.67 sec
111/113 Test #110: load_library_PWGUDupc ............................ Passed 0.66 sec
112/113 Test #113: load_library_PWGMMue ............................. Passed 0.53 sec
113/113 Test #107: load_library_PWGUDdiffractive .................... Passed 1.11 sec
98% tests passed, 2 tests failed out of 113
Total Test time (real) = 10.07 sec
The following tests FAILED:
73 - load_library_PWGHFcorrelationHF (Failed)
74 - load_library_PWGHFhfe (Failed)
Full log here.
Error while checking build/AliPhysics/root6 for 7fa77e6f4fe6b5d9bf2866f501ba9cf4708aa867 at 2021-08-24 11:11:
sw/BUILD/AliPhysics-latest/log
Start 105: load_library_PWGPPAlignment
98/116 Test #96: load_library_PWGLFnuclex ......................... Passed 2.57 sec
Start 106: load_library_PWGPP
99/116 Test #101: load_library_PWGPPevcharQnInterface .............. Passed 1.66 sec
Start 107: load_library_PWGUDbase
100/116 Test #102: load_library_PWGPPMUONdep ........................ Passed 1.84 sec
Start 108: load_library_PWGUDdiffractive
101/116 Test #105: load_library_PWGPPAlignment ...................... Passed 1.62 sec
Start 109: load_library_PWGUDFP
102/116 Test #104: load_library_PWGPPEMCAL .......................... Passed 1.84 sec
Start 110: load_library_PWGUDselectors
103/116 Test #103: load_library_PWGPPMUONlite ....................... Passed 1.97 sec
Start 111: load_library_PWGUDupc
104/116 Test #107: load_library_PWGUDbase ........................... Passed 1.30 sec
Start 112: load_library_PWGMMLumi
105/116 Test #109: load_library_PWGUDFP ............................. Passed 1.25 sec
Start 113: load_library_PWGMMMult
106/116 Test #110: load_library_PWGUDselectors ...................... Passed 1.41 sec
Start 114: load_library_PWGMMue
107/116 Test #111: load_library_PWGUDupc ............................ Passed 1.76 sec
Start 115: load_library_ML
108/116 Test #106: load_library_PWGPP ............................... Passed 3.34 sec
Start 116: load_library_RUN3
109/116 Test #108: load_library_PWGUDdiffractive .................... Passed 2.52 sec
110/116 Test #113: load_library_PWGMMMult ........................... Passed 1.22 sec
111/116 Test #112: load_library_PWGMMLumi ........................... Passed 1.74 sec
112/116 Test #115: load_library_ML .................................. Passed 1.07 sec
113/116 Test #114: load_library_PWGMMue ............................. Passed 1.92 sec
114/116 Test #116: load_library_RUN3 ................................ Passed 1.49 sec
115/116 Test #74: load_library_PWGHFhfe ............................***Failed 31.47 sec
Processing /sw/slc7_x86-64/AliPhysics/18357-slc7_x86-64-local1/test/load_library/LoadLib.C("libPWGHFhfe")...
cling::DynamicLibraryManager::loadLibrary(): /sw/slc7_x86-64/AliPhysics/18357-slc7_x86-64-local1/lib/libPWGHFhfe.so: undefined symbol: _ZN24AliAnalysisTaskBEpp13TeV8StreamerER7TBuffer
(int) -1
116/116 Test #73: load_library_PWGHFcorrelationHF ..................***Failed 31.54 sec
Processing /sw/slc7_x86-64/AliPhysics/18357-slc7_x86-64-local1/test/load_library/LoadLib.C("libPWGHFcorrelationHF")...
cling::DynamicLibraryManager::loadLibrary(): /sw/slc7_x86-64/AliPhysics/18357-slc7_x86-64-local1/lib/libPWGHFhfe.so: undefined symbol: _ZN24AliAnalysisTaskBEpp13TeV8StreamerER7TBuffer
(int) -1
98% tests passed, 2 tests failed out of 116
Total Test time (real) = 61.28 sec
The following tests FAILED:
73 - load_library_PWGHFcorrelationHF (Failed)
74 - load_library_PWGHFhfe (Failed)
Full log here.
Error while checking build/AliPhysics/release for 04db27a35b42d003ab0fcfa107f8b5c0e42ba9cd at 2021-09-01 05:47:
sw/BUILD/AliPhysics-latest/log
Start 72: load_library_PWGHFbase
90/113 Test #47: load_library_PWGCFV0LamAnalysis .................. Passed 0.40 sec
Start 45: load_library_PWGCFK0Analysis
91/113 Test #51: load_library_PWGCFK0pAnalysis .................... Passed 0.39 sec
Start 2: load_library_EventMixing
92/113 Test #1: load_library_CORRFW .............................. Passed 0.39 sec
Start 41: load_library_PWGCFChaoticity
93/113 Test #50: load_library_PWGCFKPAnalysis ..................... Passed 0.40 sec
Start 15: load_library_PWGflowBase
94/113 Test #44: load_library_PWGCFHCascadeAnalysis ............... Passed 0.41 sec
Start 92: load_library_PWGLFthermalfits
95/113 Test #57: load_library_PWGCFflowCMETwoPwrtRP ............... Passed 0.40 sec
Start 24: load_library_PWGCALO
96/113 Test #97: load_library_PWGPPpid ............................ Passed 0.40 sec
Start 53: load_library_PWGCFFEMTOSCOPYAOD
97/113 Test #72: load_library_PWGHFbase ........................... Passed 0.41 sec
Start 111: load_library_PWGMMLumi
98/113 Test #45: load_library_PWGCFK0Analysis ..................... Passed 0.40 sec
Start 108: load_library_PWGUDFP
99/113 Test #2: load_library_EventMixing ......................... Passed 0.41 sec
Start 67: load_library_PWGDQbase
100/113 Test #41: load_library_PWGCFChaoticity ..................... Passed 0.41 sec
Start 17: load_library_PWGGlauber
101/113 Test #15: load_library_PWGflowBase ......................... Passed 0.41 sec
Start 54: load_library_PWGCFflowBW
102/113 Test #92: load_library_PWGLFthermalfits .................... Passed 0.37 sec
Start 65: load_library_PWGGAUtils
103/113 Test #24: load_library_PWGCALO ............................. Passed 0.40 sec
Start 99: load_library_PWGPPevcharQn
104/113 Test #53: load_library_PWGCFFEMTOSCOPYAOD .................. Passed 0.43 sec
Start 14: load_library_PWGEMCALtriggerPart
105/113 Test #65: load_library_PWGGAUtils .......................... Passed 0.27 sec
Start 75: load_library_vertexingHFTMVA
106/113 Test #17: load_library_PWGGlauber .......................... Passed 0.28 sec
107/113 Test #54: load_library_PWGCFflowBW ......................... Passed 0.29 sec
108/113 Test #99: load_library_PWGPPevcharQn ....................... Passed 0.27 sec
109/113 Test #14: load_library_PWGEMCALtriggerPart ................. Passed 0.25 sec
110/113 Test #111: load_library_PWGMMLumi ........................... Passed 0.40 sec
111/113 Test #108: load_library_PWGUDFP ............................. Passed 0.40 sec
112/113 Test #67: load_library_PWGDQbase ........................... Passed 0.37 sec
113/113 Test #75: load_library_vertexingHFTMVA ..................... Passed 0.24 sec
98% tests passed, 2 tests failed out of 113
Total Test time (real) = 9.21 sec
The following tests FAILED:
73 - load_library_PWGHFcorrelationHF (Failed)
74 - load_library_PWGHFhfe (Failed)
Full log here.
Error while checking build/AliPhysics/root6 for 04db27a35b42d003ab0fcfa107f8b5c0e42ba9cd at 2021-09-01 05:16:
sw/BUILD/AliPhysics-latest/log
Start 105: load_library_PWGPPAlignment
98/116 Test #96: load_library_PWGLFnuclex ......................... Passed 1.72 sec
Start 106: load_library_PWGPP
99/116 Test #101: load_library_PWGPPevcharQnInterface .............. Passed 1.01 sec
Start 107: load_library_PWGUDbase
100/116 Test #102: load_library_PWGPPMUONdep ........................ Passed 1.03 sec
Start 108: load_library_PWGUDdiffractive
101/116 Test #103: load_library_PWGPPMUONlite ....................... Passed 0.95 sec
Start 109: load_library_PWGUDFP
102/116 Test #104: load_library_PWGPPEMCAL .......................... Passed 0.95 sec
Start 110: load_library_PWGUDselectors
103/116 Test #105: load_library_PWGPPAlignment ...................... Passed 0.93 sec
Start 111: load_library_PWGUDupc
104/116 Test #107: load_library_PWGUDbase ........................... Passed 0.65 sec
Start 112: load_library_PWGMMLumi
105/116 Test #109: load_library_PWGUDFP ............................. Passed 0.67 sec
Start 113: load_library_PWGMMMult
106/116 Test #110: load_library_PWGUDselectors ...................... Passed 0.79 sec
Start 114: load_library_PWGMMue
107/116 Test #112: load_library_PWGMMLumi ........................... Passed 0.62 sec
Start 115: load_library_ML
108/116 Test #106: load_library_PWGPP ............................... Passed 1.76 sec
Start 116: load_library_RUN3
109/116 Test #113: load_library_PWGMMMult ........................... Passed 0.63 sec
110/116 Test #111: load_library_PWGUDupc ............................ Passed 1.00 sec
111/116 Test #108: load_library_PWGUDdiffractive .................... Passed 1.57 sec
112/116 Test #115: load_library_ML .................................. Passed 0.63 sec
113/116 Test #114: load_library_PWGMMue ............................. Passed 0.89 sec
114/116 Test #116: load_library_RUN3 ................................ Passed 0.76 sec
115/116 Test #74: load_library_PWGHFhfe ............................***Failed 19.05 sec
Processing /sw/slc7_x86-64/AliPhysics/18357-slc7_x86-64-local1/test/load_library/LoadLib.C("libPWGHFhfe")...
cling::DynamicLibraryManager::loadLibrary(): /sw/slc7_x86-64/AliPhysics/18357-slc7_x86-64-local1/lib/libPWGHFhfe.so: undefined symbol: _ZN24AliAnalysisTaskBEpp13TeV8StreamerER7TBuffer
(int) -1
116/116 Test #73: load_library_PWGHFcorrelationHF ..................***Failed 19.09 sec
Processing /sw/slc7_x86-64/AliPhysics/18357-slc7_x86-64-local1/test/load_library/LoadLib.C("libPWGHFcorrelationHF")...
cling::DynamicLibraryManager::loadLibrary(): /sw/slc7_x86-64/AliPhysics/18357-slc7_x86-64-local1/lib/libPWGHFhfe.so: undefined symbol: _ZN24AliAnalysisTaskBEpp13TeV8StreamerER7TBuffer
(int) -1
98% tests passed, 2 tests failed out of 116
Total Test time (real) = 28.62 sec
The following tests FAILED:
73 - load_library_PWGHFcorrelationHF (Failed)
74 - load_library_PWGHFhfe (Failed)
Full log here.
@jonghan7: there are conflicts in your changes (04db27a35b42d003ab0fcfa107f8b5c0e42ba9cd) you need to fix.
You can have a look at the documentation or you can press the Resolve conflicts button and try to fix them from the web interface.
@jpxrk: there are conflicts in your changes (04db27a35b42d003ab0fcfa107f8b5c0e42ba9cd) you need to fix.
You can have a look at the documentation or you can press the Resolve conflicts button and try to fix them from the web interface.
No action since months, closing. Please make an updated PR if you still need these changes.
