StFcsMIPMaker doesn't compile on main branch

[star-bnl]

StFcsMIPMaker doesn't compile on main branch

[akioogawa]

I have fixes on StFcsMIPMaker, StFcsPi0ReconstructionMaker and a change in StTriggerFIlterMaker, all under StSpinPool at my repo (akioogawa/star-sw), total 6 files modified. But the repo also has past 5 commits & 10 other changes. Some of them already merged to main STAR repo (or at least I thought so for StRoot/StFcsFastSimulatorMaker/macro/README.MC), some are on those MC filters at other branch. I'm not sure what to do. Just make another PR with them? Create a branch?

[akioogawa]

On my GitHub webpage, I feel like I should be able to click "contribute -> Open pull request" and then click in or out commits to pick and choose which commist to be included or not in the PR.

[veprbl]

I have fixes on StFcsMIPMaker, StFcsPi0ReconstructionMaker and a change in StTriggerFIlterMaker, all under StSpinPool at my repo (akioogawa/star-sw), total 6 files modified. But the repo also has past 5 commits & 10 other changes. Some of them already merged to main STAR repo (or at least I thought so for StRoot/StFcsFastSimulatorMaker/macro/README.MC), some are on those MC filters at other branch. I'm not sure what to do. Just make another PR with them? Create a branch?

I would go for a new branch. Should be something along the lines of

git fetch upstream
git checkout upstream/master
git branch pr/StFcsDb_fixes
git cherry-pick 1d2b69e067e95986a53380ce06dc609f225c7911
git push -u origin pr/StFcsDb_fixes

[veprbl]

On my GitHub webpage, I feel like I should be able to click "contribute -> Open pull request" and then click in or out commits to pick and choose which commist to be included or not in the PR.

You can only choose a single branch to create a GitHub PR. That branch has to be prepared using git itself – there are no tools to pick out commits in GitHub.

[akioogawa]

I did follow the suggestion and end up with a new branch which has all 6 commits/16files modified.

[veprbl]

My bad, the second step should have been git checkout upstream/main, the git checkout upstream/master should have printed an error for you, as there is no branch with the name "master".

New steps to correct this:

git checkout pr/StFcsDb_fixes
git reset --hard upstream/main
git cherry-pick 1d2b69e067e95986a53380ce06dc609f225c7911
git push -f origin pr/StFcsDb_fixes

[akioogawa]

Thanks. This time I think it was successful. I made PR. Thanks!