We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent 5068a19 commit e417dc9Copy full SHA for e417dc9
1 file changed
docs/release-process.md
@@ -315,7 +315,7 @@ slightly different steps. We'll call attention where the steps differ.
315
branches when on PHP.X.Y+1 or master after the merge resulting in the
316
conflicts.
317
318
- ```
+ ```shell
319
git checkout --ours main/php_version.h Zend/zend.h configure.ac
320
git add main/php_version.h Zend/zend.h configure.ac
321
git merge --continue
0 commit comments