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 broken image link #5268

Merged
merged 1 commit into from
Jul 30, 2024
Merged

Fix broken image link #5268

merged 1 commit into from
Jul 30, 2024

Conversation

rustydb
Copy link
Contributor

@rustydb rustydb commented Jul 30, 2024

Fixes broken link detected by docs-csm team when reviewing #5260 's linkchecker.

@rustydb
Copy link
Contributor Author

rustydb commented Jul 30, 2024

/backport release/1.5 release/1.4 release/1.3 release/1.2 release/1.0

Copy link
Contributor

Backporting into branch release/1.5 was successful. New PR: #5269

Copy link
Contributor

Error occured while backporting into branch release/1.4.

Error
git -c user.name="Russell Bunch" -c user.email="doomslayer@hpe.com" cherry-pick a361c537892bce011ab7716d48abdfaaae4bbd4c -x
Auto-merging operations/conman/Access_Console_Log_Data_Via_the_System_Monitoring_Framework_SMF.md
CONFLICT (content): Merge conflict in operations/conman/Access_Console_Log_Data_Via_the_System_Monitoring_Framework_SMF.md

error: could not apply a361c53... Fix broken image link
hint: After resolving the conflicts, mark them with
hint: "git add/rm ", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config advice.mergeConflict false"

Copy link
Contributor

Error occured while backporting into branch release/1.3.

Error
git checkout -b backport/5268-to-release/1.3 -t origin/release/1.3
operations/conman/Access_Console_Log_Data_Via_the_System_Monitoring_Framework_SMF.md: needs merge

error: you need to resolve your current index first

Copy link
Contributor

Error occured while backporting into branch release/1.2.

Error
git checkout -b backport/5268-to-release/1.2 -t origin/release/1.2
operations/conman/Access_Console_Log_Data_Via_the_System_Monitoring_Framework_SMF.md: needs merge

error: you need to resolve your current index first

Copy link
Contributor

Error occured while backporting into branch release/1.0.

Error
git checkout -b backport/5268-to-release/1.0 -t origin/release/1.0
operations/conman/Access_Console_Log_Data_Via_the_System_Monitoring_Framework_SMF.md: needs merge

error: you need to resolve your current index first

@rustydb rustydb merged commit 9fa814f into release/1.6 Jul 30, 2024
5 of 8 checks passed
@rustydb rustydb deleted the sma-link-fix branch July 30, 2024 19:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants