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

[TASK] Set unique names for confvals in Gifbuilder chapter #1135

Merged
merged 1 commit into from
Mar 24, 2024

Conversation

linawolf
Copy link
Member

releases: main, 12.4

@linawolf linawolf self-assigned this Mar 24, 2024
@linawolf linawolf merged commit 7db0f30 into main Mar 24, 2024
1 check passed
@linawolf linawolf deleted the task/name-3 branch March 24, 2024 14:30
Copy link
Contributor

The backport to 12.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply c22da56f... [TASK] Set unique names for confvals in Gifbuilder chapter
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".

stdout
Auto-merging Documentation/Gifbuilder/Properties.rst
CONFLICT (content): Merge conflict in Documentation/Gifbuilder/Properties.rst

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-1135-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick c22da56fb82fb97ba98ac69d2223dd198907f259
# Push it to GitHub
git push --set-upstream origin backport-1135-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-1135-to-12.4.

@linawolf linawolf added the backport-done Changes have been backported to other branches already label Mar 24, 2024
linawolf added a commit that referenced this pull request Mar 24, 2024
releases: main, 12.4

(cherry picked from commit 7db0f30)
linawolf added a commit that referenced this pull request Mar 25, 2024
* [TASK] Set unique names for confvals in config chapter (#1132)

releases: main, 12.4

(cherry picked from commit ce6330f)

* [TASK] Set unique names for confvals in Gifbuilder chapter (#1135)

releases: main, 12.4

(cherry picked from commit 7db0f30)

* [TASK] Set unique names for confvals in datatypes chapter (#1140)

releases: main, 12.4
(cherry picked from commit 0d8deff)

* Cherry pick
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport failed backport 12.4 backport-done Changes have been backported to other branches already
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants