[PWGCF] Fix includes#16410
Conversation
|
O2 linter results: ❌ 37 errors, |
|
@ariedel-cern @isputows @jaelpark @lauraser @lgraczykCern @otonvd @prchakra @shouqiye @SwatiSaha-1997 @victor-gonzalez @wenyaCern |
|
Error while checking build/O2Physics/o2 for 2082fbf at 2026-06-01 11:25: Full log here. |
|
Error while checking build/O2Physics/staging for 2082fbf at 2026-06-01 09:44: Full log here. |
|
Dear @vkucera, For what concerns link - since there is a currently ongoing development locally on the very same task, we will implement directly your minor suggestions into the local version of the task, and they will be in the next PR from our side (we could stash and pull, but this is easier and less error-prone for us - as a rule of thumb we want to avoid resolving merging conflicts at any cost...). Thanks! |
Dear @abilandz , when do you plan to open the PR? |
Dear @vkucera, we do not have to agree on everything... But I am not ready to defend your statement "conflicts are a normal part of project development" - instead, we should perhaps organize the development in such a way that merging conflicts are minimized. As you can sense from my text, I had some traumatic experiences in the past with resolving merging conflicts, and I doubt there is anybody who is keen on doing that. Also, beware that you speak as a Git expert, while most of new students and new O2 developers are just starting to use Git. In this particular case, merging the upstream master branch into the local development branch will, by definition, result in merge conflicts. On a side note: perhaps we could try to organize your direct interventions in other developers' code differently? While we all definitely benefit from your expertise and the great effort you are investing in the O2 project, it's not really a pleasant experience that, after each of your direct interventions in our code, we have to stop our work and start resolving merge conflicts. |
|
@abilandz I understand (and know from experience) that resolving merge conflicts can be frustrating and nobody likes it. Of course we should try to minimise them but we cannot avoid them. That's what I meant when I said they are a normal part of project development. And because they are unavoidable, I think that conflict resolving skills are necessary and therefore basic, not something advanced. |
Dear @vkucera, Please nevertheless re-think this part of our Git workflow - making interventions in somebody else's code without any prior announcement, and triggering that way out of the blue merging conflicts to other developers, cannot be the final solution. Thanks for your understanding! |
Dear @abilandz , please suggest a solution that you would prefer. |
Dear @vkucera, I can think of two alternative solutions, both of which would avoid merging conflicts:
|
No description provided.