Closed knylander-grafana closed 2 months ago
The backport to release/v1.5
failed:
Validation Failed: "Could not resolve to a node with the global id of 'T_kwDOAG3Mbc4AczmP'."
To backport manually, run these commands in your terminal:
# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-3243-to-release/v1.5 origin/release/v1.5
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x bf51cd8484839f3fda82c3ce75b4bc1f78fead68
When the conflicts are resolved, stage and commit the changes:
git add . && git cherry-pick --continue
If you have the GitHub CLI installed:
# Push the branch to GitHub:
git push --set-upstream origin backport-3243-to-release/v1.5
# Create the PR body template
PR_BODY=$(gh pr view 3243 --json body --template 'Backport bf51cd8484839f3fda82c3ce75b4bc1f78fead68 from #3243{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title "[release/v1.5] [DOC] Add changes from Cloud Profiles UI to OSS docs" --body-file - --label "type/docs" --label "backport" --base release/v1.5 --milestone release/v1.5 --web
Or, if you don't have the GitHub CLI installed (we recommend you install it!):
# Push the branch to GitHub:
git push --set-upstream origin backport-3243-to-release/v1.5
# Create a pull request where the `base` branch is `release/v1.5` and the `compare`/`head` branch is `backport-3243-to-release/v1.5`.
# Remove the local backport branch
git switch main
git branch -D backport-3243-to-release/v1.5
Add doc changes from the Cloud Profiles UI docs back to the Pyroscope OSS equivalent. Based on https://github.com/grafana/website/pull/19509