diff --git a/README.md b/README.md index 85d98f4..05ea7d6 100644 --- a/README.md +++ b/README.md @@ -83,7 +83,7 @@ To cut a minor version: 7. Announce on the prometheus-announce mailing list, slack and Twitter. 8. Merge the release branch back to the `main` using the "merge without squashing" approach (!). -> NOTE: In case of merge conflicts, you can checkout the release branch in a new branch, e.g. /resolve-conflicts`, fix the merge problems there, and then do a PR into main from the new branch. In that way, you still get all the commits in the release branch back into `main`, but leave the release branch alone. +> NOTE: In case of merge conflicts, you can checkout the release branch in a new branch, e.g. `/resolve-conflicts`, fix the merge problems there, and then do a PR into main from the new branch. In that way, you still get all the commits in the release branch back into `main`, but leave the release branch alone. To cut the patch version: