Skip to content

Commit c9a7e62

Browse files
committed
fix indentation
1 parent ddc9c4d commit c9a7e62

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

docs/release-process.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -323,16 +323,16 @@ slightly different steps. We'll call attention where the steps differ.
323323
git merge PHP-X.Y+1
324324
```
325325
326-
> 🗒 **Note** \
327-
> When resolving the conflicts, ignore the changes from PHP-X.Y in higher
328-
> branches. It means using something like `git checkout --ours .` when on
329-
> PHP.X.Y+1 or master after the merge resulting in the conflicts.
330-
331-
> ```shell
332-
> git checkout --ours .
333-
> git add -p
334-
> git commit
335-
> ```
326+
> 🗒 **Note** \
327+
> When resolving the conflicts, ignore the changes from PHP-X.Y in higher
328+
> branches. It means using something like `git checkout --ours .` when on
329+
> PHP.X.Y+1 or master after the merge resulting in the conflicts.
330+
331+
> ```shell
332+
> git checkout --ours .
333+
> git add -p
334+
> git commit
335+
> ```
336336
337337
11. Run the following using the release tag to export the tree, create the
338338
`configure` script, and build and compress three tarballs (`.tar.gz`,

0 commit comments

Comments
 (0)