You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
So we need a way to pick a single parent commit. In this case we should grab the commit hash from the main branch, not the one from the feature branch.
The patch with the fix should be applied here and in the microbit-dal repository:
A similar CI script has been added to the microbit-dal project and the merge commit failed due to the git command used to get the parent commit returning two parents instead of one:
https://github.com/lancaster-university/microbit-dal/actions/runs/8708366961/job/23885570183
The git command used to get the parent commit is:
git log --pretty=%P -n 1 HEAD^0
Which for that merge commit would return:
As shown in the Markdown created to summarise the result:
https://github.com/lancaster-university/microbit-dal/actions/runs/8708366961
So we need a way to pick a single parent commit. In this case we should grab the commit hash from the main branch, not the one from the feature branch.
The patch with the fix should be applied here and in the microbit-dal repository:
The text was updated successfully, but these errors were encountered: