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] Clarify constants do not work in constant conditions #1294

Merged
merged 4 commits into from
Jul 7, 2024

Conversation

linawolf
Copy link
Member

@linawolf linawolf commented Jul 5, 2024

releases: main, 12.4
resolves: TYPO3-Documentation/Changelog-To-Doc#925

Co-authored-by: Stefan Frömken <froemken@gmail.com>
@froemken froemken merged commit c38d124 into main Jul 7, 2024
8 checks passed
@froemken froemken deleted the linawolf-patch-1 branch July 7, 2024 10:56
Copy link

github-actions bot commented Jul 8, 2024

The backport to 12.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 792e4301... [TASK] Clarify constants do not work in constant conditions
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/Conditions/Index.rst
CONFLICT (content): Merge conflict in Documentation/Conditions/Index.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-1294-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 792e430136a19abd54e75574847e6150caab5a5c,eb63e7f5a7ca15fc430f352362debe8a63feb142,47314aa2ec00c2ac6868df070bf78e419950c6d7,5a996b25d73232aa0a8304b9be6bed6a7572c9a2
# Push it to GitHub
git push --set-upstream origin backport-1294-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-1294-to-12.4.

linawolf added a commit that referenced this pull request Jul 8, 2024
* [TASK] Clarify constants do not work in constant conditions

releases: main, 12.4
resolves: TYPO3-Documentation/Changelog-To-Doc#925

* Typo in settings

* Update Documentation/Conditions/Index.rst

Co-authored-by: Stefan Frömken <froemken@gmail.com>

---------

Co-authored-by: Stefan Frömken <froemken@gmail.com>

(cherry picked from commit c38d124)
@linawolf linawolf added backport-done Changes have been backported to other branches already and removed backport failed labels Jul 8, 2024
@froemken froemken restored the linawolf-patch-1 branch July 8, 2024 05:29
@sfroemkenjw sfroemkenjw deleted the linawolf-patch-1 branch July 8, 2024 05:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

[TASK] Clarify constants do not work in constant conditions
2 participants