[Infrastructure,Common,ALICE3,PWGCF,PWGDQ,PWGEM,PWGHF,PWGJE,PWGLF,PWGUD,DPG,Trigger] Resolve conflicts with master branch #18
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[PWGHF] Adapt config_massfitter for FixFracDoubleGaus
github-actions
bot
added
pwghf
alice3
common
infrastructure
datamodel
dpg
pwgcf
pwgdq
pwgem
pwgje
pwglf
pwgud
trigger
labels
github-actions
bot
changed the title
|
O2 linter results: ❌ 5650 errors, |
Author
|
Close the PR since conflicts are resolved by @pstahlhu independently. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Hi @pstahlhu, sorry for disturbing you but I would really appreciate if the master edition of the fitter will be fixed soon, since I need to develop some more features of the fitter and do not want to diverge too much.
This PR is supposed to fix the conflict of your branch with the target branch. If you merge it, I am 99% sure that the conflict will disappear and we will ask codeowners to consider the PR.
If you prefer not to merge this PR (because it looks suspicious, modifying plenty of files and I still leave 1% that something will go wrong) here is a commit which shows how I would resolve the conflict - basically you always choose your version and paste in it clang-tidy fixes done by Vit.
Thanks for your time!