PHPC-2433: Test PHP 8.4 on Evergreen (#1721): f3a285a5
Resolving conflicts
To resolve any conflicts, check out the temporary branch and run the following command:
git merge v1.x
Ignoring changes
To ignore from the remote branch, first reset the temporary branch to v1.x and manually merge using the `ours` merge strategy:
git reset --hard v1.x
git merge --strategy=ours v1.20
Then, push the temporary branch to upate the pull request.
alcaeus
commented
1 month ago
Merge new changes from v1.20 into v1.x.
Commits
To resolve any conflicts, check out the temporary branch and run the following command: git merge v1.xResolving conflicts
To ignore from the remote branch, first reset the temporary branch to v1.x and manually merge using the `ours` merge strategy: git reset --hard v1.x git merge --strategy=ours v1.20 Then, push the temporary branch to upate the pull request.Ignoring changes