Skip to content

[PWGHF] Xic0 update#15487

Merged
zhangbiao-phy merged 1 commit intoAliceO2Group:masterfrom
jinhyunni:xic0-update
Mar 23, 2026
Merged

[PWGHF] Xic0 update#15487
zhangbiao-phy merged 1 commit intoAliceO2Group:masterfrom
jinhyunni:xic0-update

Conversation

@jinhyunni
Copy link
Contributor

Fixed cut-related errors and added missing continue statements for failed KFParticle reconstruction of V0, cascade, or charm baryon candidates.

@zhangbiao-phy
Copy link
Collaborator

Hi @jinhyunni, could you please squash your commits? Then we will approve it. Thanks!

@jinhyunni
Copy link
Contributor Author

jinhyunni commented Mar 23, 2026

Hi @jinhyunni, could you please squash your commits? Then we will approve it. Thanks!

Sorry for a trivial question, but how can I squash commits?

@vkucera
Copy link
Collaborator

vkucera commented Mar 23, 2026

@jinhyunni Why does your branch contain all the commits from your previous PR? You should always start a new branch from the latest master.
Since the only relevant commit is the last one, the easiest way to clean up this PR is probably to rename this branch, update the master, create a new xic0-update branch from the master, cherry-pick your commit, force-push.

@jinhyunni
Copy link
Contributor Author

@jinhyunni Why does your branch contain all the commits from your previous PR? You should always start a new branch from the latest master. Since the only relevant commit is the last one, the easiest way to clean up this PR is probably to rename this branch, update the master, create a new xic0-update branch from the master, cherry-pick your commit, force-push.

Hi Vit, and thanks for your comment!

I think the issue happened because I had previously worked directly on my origin/master branch, which, as far as I know, is not the recommended workflow.

I have now updated my origin/master branch so that it is fully consistent with upstream/master, and I have proceeded as you suggested in your comment.

@jinhyunni
Copy link
Contributor Author

Hi @zhangbiao-phy,

I cleaned up the commit history as you requested.
Could you please take another look at this PR?
If everything looks good, I would appreciate your approval.

@zhangbiao-phy
Copy link
Collaborator

Hi @zhangbiao-phy,

I cleaned up the commit history as you requested. Could you please take another look at this PR? If everything looks good, I would appreciate your approval.

OK,Thanks!

@zhangbiao-phy zhangbiao-phy enabled auto-merge (squash) March 23, 2026 12:43
@zhangbiao-phy zhangbiao-phy disabled auto-merge March 23, 2026 12:43
@zhangbiao-phy zhangbiao-phy merged commit 9f1ece1 into AliceO2Group:master Mar 23, 2026
13 checks passed
@jinhyunni jinhyunni deleted the xic0-update branch March 23, 2026 12:45
@jinhyunni
Copy link
Contributor Author

Thanks for the approval!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

pwghf PWG-HF

Development

Successfully merging this pull request may close these issues.

3 participants