Update: we released v3.6.x of the Git Clone step to solve this issue, by doing manual git merge instead of relying on the GitHub provided /merge branch to be up to date.
Unfortunately we hit a couple of edge cases and so we reverted the default “merge strategy” in the latest v3.6.2 version. That said, 3.6.2 should be safe to use even with the new manual merge strategy, but we’ll do another update ASAP which will address the discovered edge cases.
As mentioned in the release notes to opt-in to the new merge strategy simply upgrade to v3.6.2 and change the manual_merge input option from "no" to "yes". Feedback would be really appreciated 