Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix typo in docs: s/pryoscope/pyroscope #3206

Merged
merged 1 commit into from
Apr 12, 2024
Merged

Conversation

dgzlopes
Copy link
Member

No description provided.

@dgzlopes dgzlopes requested review from a team as code owners April 12, 2024 09:52
@CLAassistant
Copy link

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you sign our Contributor License Agreement before we can accept your contribution.
You have signed the CLA already but the status is still pending? Let us recheck it.

Copy link
Contributor

@simonswine simonswine left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@simonswine simonswine added type/docs Improvements for doc docs. Used by Docs team for project management backport release/v1.5 This label will backport a merged PR to the release/v1.5 branch labels Apr 12, 2024
@simonswine simonswine enabled auto-merge (squash) April 12, 2024 09:53
Copy link
Contributor

This PR must be merged before a backport PR will be created.

1 similar comment
Copy link
Contributor

This PR must be merged before a backport PR will be created.

@simonswine simonswine merged commit f1b5d3a into grafana:main Apr 12, 2024
17 of 18 checks passed
github-actions bot pushed a commit that referenced this pull request Apr 12, 2024
(cherry picked from commit f1b5d3a)
Copy link
Contributor

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-3206-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 f1b5d3ac41fe4e423bcb1245e01de99e77b075c6

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-3206-to-release/v1.5
# Create the PR on GitHub
gh pr create --title "[release/v1.5] Fix typo in docs: s/pryoscope/pyroscope" --body "Backport f1b5d3ac41fe4e423bcb1245e01de99e77b075c6 from #3206" --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-3206-to-release/v1.5

# Create a pull request where the `base` branch is `release/v1.5` and the `compare`/`head` branch is `backport-3206-to-release/v1.5`.

# Remove the local backport branch
git switch main
git branch -D backport-3206-to-release/v1.5

simonswine added a commit to simonswine/pyroscope that referenced this pull request Apr 12, 2024
simonswine pushed a commit that referenced this pull request Apr 12, 2024
(cherry picked from commit f1b5d3a)

Co-authored-by: Daniel González Lopes <danielgonzalezlopes@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release/v1.5 This label will backport a merged PR to the release/v1.5 branch backport-failed type/docs Improvements for doc docs. Used by Docs team for project management
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants