Uh oh!
There was an error while loading. Please reload this page.
Fix centrality config and remove POI - #6094
Conversation
Please consider the following formatting changes to AliceO2Group#6094
Please consider the following formatting changes to AliceO2Group#6094
alibuild
commented
May 10, 2024
Error while checking build/O2Physics/o2 for 88f2d43 at 2024-05-10 07:45: Full log here. |
Hello @victor-gonzalez However it was compiling locally, but here did not work. iris_antreas_likmeta@Iris-Antreass-MacBook-Pro O2Physics % git push -f origin |
victor-gonzalez
commented
May 10, 2024
You have to fix it locally in your master at your local repository and push your master to the master of your fork in gitHub |
victor-gonzalez
commented
May 10, 2024
All compiler errors are correct compiler errors according to the current content of the |
Whenever I do git status Changes not staged for commit: and is not letting me to push code. Do you have a suggestion on how to solve this? |
victor-gonzalez
commented
May 10, 2024
From where did you get the latest update on which you are trying to rebase? |
ilikmeta
commented
May 10, 2024
before I push the code I did: inside O2Physis |
victor-gonzalez
commented
May 10, 2024
But that did not fail because you were able to push for creating the pull request, right? |
ilikmeta
commented
May 10, 2024
Once I pushed the new changes for the first time, then there was a conflicing file that appeared below the checks which was showing the latest changes I did to my code. By opening the conflicting file, the FlowGFWPbPb.cxx , I removed the lines that I had deleted before I push and then I clicked on the Resolved button and merge. Then alibuilt returned with errors and now I cannot even do a hard reset: PWGCF/Flow/Tasks/FlowGFWPbPb.cxx: needs merge |
ilikmeta
commented
May 10, 2024
@victor-gonzalez Is it possible to discard this pull request and make a new one as now the git status is up to date? |
Please consider the following formatting changes to AliceO2Group#6094
victor-gonzalez
commented
May 10, 2024
Two questions before
means you did the changes directly on gitHub? If that is the case you should never do that unless they are really minor changes, i.e. the ones suggested by the formatter |
ilikmeta
commented
May 10, 2024
iris_antreas_likmeta@Iris-Antreass-MacBook-Pro O2Physics % git remote -v Yes, I did changes on GitHub as I thought I will not let the checks to be done. Thanks for mentioning to avoid this! I just pushed again after fixing my local repo. So far no errors occured. My appologies for giving hard time with this. |
victor-gonzalez
commented
May 10, 2024
No problem! |
* Try to fix alibuilt error * Please consider the following formatting changes --------- Co-authored-by: ALICE Action Bot <alibuild@cern.ch>
* Try to fix alibuilt error * Please consider the following formatting changes --------- Co-authored-by: ALICE Action Bot <alibuild@cern.ch>
No description provided.