From 4fb1f1f6ee94d33313dc60f8ec42be86a5b7c153 Mon Sep 17 00:00:00 2001 From: Maedah Batool Date: Thu, 3 Oct 2024 15:18:27 -0700 Subject: [PATCH] Fix 500 server error docker-compose/upgrade docs - https://sourcegraph.com/docs/admin/deploy/docker-compose/upgrade --- docs/admin/deploy/docker-compose/upgrade.mdx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/admin/deploy/docker-compose/upgrade.mdx b/docs/admin/deploy/docker-compose/upgrade.mdx index 4443a9701..40adfc660 100644 --- a/docs/admin/deploy/docker-compose/upgrade.mdx +++ b/docs/admin/deploy/docker-compose/upgrade.mdx @@ -10,7 +10,9 @@ This document describes the process to update a Docker Compose Sourcegraph insta 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. -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}. +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()}. ```sh # first, checkout the release branch @@ -26,7 +28,7 @@ git merge {CURRENT_VERSION} 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. -> 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()}: +> 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()}: > > `git merge -X theirs {CURRENT_VERSION_STRING}` >