Merge branch 'v1.20' into merge-v1.20-into-v1.x-1727268864674: adbb6656
Don't build with PHPC 1.x on legacy PHP versions (#1456): 75da9ea3
Resolving conflicts
To resolve any conflicts, check out the temporary branch and run the following command:
git merge v2.x
Ignoring changes
To ignore from the remote branch, first reset the temporary branch to v2.x and manually merge using the `ours` merge strategy:
git reset --hard v2.x
git merge --strategy=ours v1.x
Then, push the temporary branch to upate the pull request.
Merge new changes from v1.x into v2.x.
Commits
To resolve any conflicts, check out the temporary branch and run the following command: git merge v2.xResolving conflicts
To ignore from the remote branch, first reset the temporary branch to v2.x and manually merge using the `ours` merge strategy: git reset --hard v2.x git merge --strategy=ours v1.x Then, push the temporary branch to upate the pull request.Ignoring changes