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

[BUGFIX] Correct the interlink shortcode #113

Merged
merged 1 commit into from
Sep 21, 2024
Merged

[BUGFIX] Correct the interlink shortcode #113

merged 1 commit into from
Sep 21, 2024

Conversation

linawolf
Copy link
Member

Releases: main, 12.4, 11.5

Releases: main, 12.4, 11.5
@linawolf linawolf self-assigned this Sep 21, 2024
@linawolf linawolf merged commit bca42c4 into main Sep 21, 2024
4 checks passed
@linawolf linawolf deleted the linawolf-patch-1 branch September 21, 2024 11:51
Copy link

The backport to 11.5 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 07071f3... [BUGFIX] Correct the interlink shortcode
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", 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"

stdout
Auto-merging Documentation/guides.xml
CONFLICT (content): Merge conflict in Documentation/guides.xml

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-11.5 11.5
# Navigate to the new working tree
cd .worktrees/backport-11.5
# Create a new branch
git switch --create backport-113-to-11.5
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 07071f33af7ced0c196c017b3ec8c21beadb8579
# Push it to GitHub
git push --set-upstream origin backport-113-to-11.5
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-11.5

Then, create a pull request where the base branch is 11.5 and the compare/head branch is backport-113-to-11.5.

Copy link

The backport to 12.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 07071f3... [BUGFIX] Correct the interlink shortcode
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", 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"

stdout
Auto-merging Documentation/guides.xml
CONFLICT (content): Merge conflict in Documentation/guides.xml

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-12.4 12.4
# Navigate to the new working tree
cd .worktrees/backport-12.4
# Create a new branch
git switch --create backport-113-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 07071f33af7ced0c196c017b3ec8c21beadb8579
# Push it to GitHub
git push --set-upstream origin backport-113-to-12.4
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-12.4

Then, create a pull request where the base branch is 12.4 and the compare/head branch is backport-113-to-12.4.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant