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] Overhaul inline type #1007

Merged
merged 2 commits into from
Mar 28, 2024
Merged

[TASK] Overhaul inline type #1007

merged 2 commits into from
Mar 28, 2024

Conversation

linawolf
Copy link
Member

  • Correct indentation,
  • add names for confvals

releases: main, 12.4, 11.5

* Correct indentation,
* add names for confvals

releases: main, 12.4, 11.5
@linawolf linawolf merged commit 2125ff1 into main Mar 28, 2024
4 checks passed
@linawolf linawolf deleted the task/name-27 branch March 28, 2024 05:24
Copy link
Contributor

The backport to 11.5 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply a5406e5... [TASK] Overhaul inline type
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/ColumnsConfig/Type/Inline/Examples.rst
CONFLICT (content): Merge conflict in Documentation/ColumnsConfig/Type/Inline/Examples.rst
Auto-merging Documentation/ColumnsConfig/Type/Inline/Index.rst
Auto-merging Documentation/ColumnsConfig/Type/Inline/Properties/Appearance.rst
CONFLICT (content): Merge conflict in Documentation/ColumnsConfig/Type/Inline/Properties/Appearance.rst
Auto-merging Documentation/ColumnsConfig/Type/Inline/Properties/Filter.rst
CONFLICT (content): Merge conflict in Documentation/ColumnsConfig/Type/Inline/Properties/Filter.rst
Auto-merging Documentation/ColumnsConfig/Type/Inline/Properties/Index.rst
Auto-merging Documentation/ColumnsConfig/Type/Inline/Properties/Mm.rst
CONFLICT (content): Merge conflict in Documentation/ColumnsConfig/Type/Inline/Properties/Mm.rst
Auto-merging Documentation/ColumnsConfig/Type/Inline/Properties/Size.rst
CONFLICT (content): Merge conflict in Documentation/ColumnsConfig/Type/Inline/Properties/Size.rst
Auto-merging Documentation/ColumnsConfig/Type/Inline/Properties/SymmetricField.rst
CONFLICT (content): Merge conflict in Documentation/ColumnsConfig/Type/Inline/Properties/SymmetricField.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-11.5 11.5
# Navigate to the new working tree
cd .worktrees/backport-11.5
# Create a new branch
git switch --create backport-1007-to-11.5
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick a5406e56e8dc73aed7b2abaaf34802732e5db6de,932ad66eb6dc7838508aab8e8ae0a2d6f6722d80
# Push it to GitHub
git push --set-upstream origin backport-1007-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-1007-to-11.5.

Copy link
Contributor

The backport to 12.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply a5406e5... [TASK] Overhaul inline type
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/ColumnsConfig/Type/Inline/Index.rst
Auto-merging Documentation/ColumnsConfig/Type/Inline/Properties/Mm.rst
CONFLICT (content): Merge conflict in Documentation/ColumnsConfig/Type/Inline/Properties/Mm.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-1007-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick a5406e56e8dc73aed7b2abaaf34802732e5db6de,932ad66eb6dc7838508aab8e8ae0a2d6f6722d80
# Push it to GitHub
git push --set-upstream origin backport-1007-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-1007-to-12.4.

linawolf added a commit that referenced this pull request Mar 28, 2024
* [TASK] Overhaul inline type

* Correct indentation,
* add names for confvals

releases: main, 12.4, 11.5

* Update Documentation/ColumnsConfig/Type/Inline/Properties/Mm.rst

---------

Co-authored-by: Chris Müller <[email protected]>

(cherry picked from commit 2125ff1)
linawolf added a commit that referenced this pull request Mar 28, 2024
* [TASK] Overhaul inline type

* Correct indentation,
* add names for confvals

releases: main, 12.4, 11.5

* Update Documentation/ColumnsConfig/Type/Inline/Properties/Mm.rst

---------

Co-authored-by: Chris Müller <[email protected]>

(cherry picked from commit 2125ff1)
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.

2 participants