Skip to content

Commit 4fb1f1f

Browse files
authored
Fix 500 server error docker-compose/upgrade docs
- https://sourcegraph.com/docs/admin/deploy/docker-compose/upgrade
1 parent d4c4f46 commit 4fb1f1f

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

docs/admin/deploy/docker-compose/upgrade.mdx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ This document describes the process to update a Docker Compose Sourcegraph insta
1010

1111
A [standard upgrade](/admin/updates/#upgrade-types) occurs between a Sourcegraph version and the minor or major version released immediately after it. If you would like to jump forward several versions, you must perform a [multi-version upgrade](#multi-version-upgrades) instead.
1212

13-
If you've [configured Docker Compose with a release branch](/admin/deploy/docker-compose/#step-1-prepare-the-deployment-repository), please merge the upstream release tag for the next minor version into your `release` branch. In the following example, the release branch is being upgraded to {CURRENT_VERSION_STRING}.
13+
If you've [configured Docker Compose with a release branch](/admin/deploy/docker-compose/#step-1-prepare-the-deployment-repository), please merge the upstream release tag for the next minor version into your `release` branch.
14+
15+
In the following example, the release branch is being upgraded to {CURRENT_VERSION_STRING()}.
1416

1517
```sh
1618
# first, checkout the release branch
@@ -26,7 +28,7 @@ git merge {CURRENT_VERSION}
2628

2729
For each conflict, you need to reconcile any customizations you made with the updates from the new version. Use the information you gathered earlier from the change log and changes list to interpret the merge conflict and to ensure that it doesn't over-write your customizations. You may need to update your customizations to accommodate the new version.
2830

29-
> NOTE: If you have made no changes or only very minimal changes to your configuration, you can also ask git to always select incoming changes in the event of merge conflicts. In the following example merges will be accepted from the upstream version {CURREN_VERSION_STRING()}:
31+
> NOTE: If you have made no changes or only very minimal changes to your configuration, you can also ask git to always select incoming changes in the event of merge conflicts. In the following example merges will be accepted from the upstream version {CURRENT_VERSION_STRING()}:
3032
>
3133
> `git merge -X theirs {CURRENT_VERSION_STRING}`
3234
>

0 commit comments

Comments
 (0)