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 data / gettext chapter #1165

Merged
merged 8 commits into from
Apr 3, 2024
Merged

[TASK] Overhaul data / gettext chapter #1165

merged 8 commits into from
Apr 3, 2024

Conversation

linawolf
Copy link
Member

@linawolf linawolf commented Apr 2, 2024

  • Use confvals instead of aspects
  • Correct indentation
  • Give headlines to examples
  • Some small changes where content didnt make sense

* Use confvals instead of aspects
* Correct indentation
* Give headlines to examples
* Some small changes where content didnt make sense
Documentation/Functions/Data.rst Outdated Show resolved Hide resolved
Documentation/Functions/Data.rst Outdated Show resolved Hide resolved
Documentation/Functions/Data.rst Outdated Show resolved Hide resolved
Documentation/Functions/Data.rst Outdated Show resolved Hide resolved
Documentation/Functions/Data.rst Outdated Show resolved Hide resolved
Documentation/Functions/Data.rst Outdated Show resolved Hide resolved
Documentation/Functions/Data.rst Outdated Show resolved Hide resolved
Documentation/Functions/Data.rst Outdated Show resolved Hide resolved
Documentation/Functions/Data.rst Outdated Show resolved Hide resolved
Documentation/Functions/Data.rst Outdated Show resolved Hide resolved
linawolf and others added 7 commits April 2, 2024 20:33
* Use confvals instead of tables
* Correct indentation
* Give headlines to examples
* Introduce a toc for the properties
@linawolf linawolf requested a review from brotkrueml April 2, 2024 19:32
@linawolf linawolf merged commit a41daa7 into main Apr 3, 2024
2 checks passed
@linawolf linawolf deleted the task/data branch April 3, 2024 16:29
Copy link
Contributor

github-actions bot commented Apr 3, 2024

The backport to 11.5 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply dd82c27a... [TASK] Overhaul data / gettext 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/Functions/Data.rst
CONFLICT (content): Merge conflict in Documentation/Functions/Data.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-1165-to-11.5
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick dd82c27a291a77f833bd82b29a45cff25df8748c,36b750c9d64d7bbe2b24907b89be68b211b1e266,9449caaca3d8c09ab7fa9e02fef28d113c0df44c,d5507932bddfaf340eebaf8006cb12117599372d,0ea55fd6e2688a9e3bb775b24a7242a93616d0bd,28973c3019daa8575ef3e424a065c76ee4692a82,26b40b109ded0bf820ad55fc01efa3688fdf571b,5cac53af3c3ac53342b115c348d414bc1ee166c6
# Push it to GitHub
git push --set-upstream origin backport-1165-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-1165-to-11.5.

Copy link
Contributor

github-actions bot commented Apr 3, 2024

The backport to 12.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply dd82c27a... [TASK] Overhaul data / gettext 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/Functions/Data.rst
CONFLICT (content): Merge conflict in Documentation/Functions/Data.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-1165-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick dd82c27a291a77f833bd82b29a45cff25df8748c,36b750c9d64d7bbe2b24907b89be68b211b1e266,9449caaca3d8c09ab7fa9e02fef28d113c0df44c,d5507932bddfaf340eebaf8006cb12117599372d,0ea55fd6e2688a9e3bb775b24a7242a93616d0bd,28973c3019daa8575ef3e424a065c76ee4692a82,26b40b109ded0bf820ad55fc01efa3688fdf571b,5cac53af3c3ac53342b115c348d414bc1ee166c6
# Push it to GitHub
git push --set-upstream origin backport-1165-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-1165-to-12.4.

linawolf added a commit that referenced this pull request Apr 3, 2024
* [TASK] Overhaul data / gettext chapter

* Use confvals instead of aspects
* Correct indentation
* Give headlines to examples
* Some small changes where content didnt make sense

* Update Documentation/Functions/Data.rst

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

* Update Documentation/Functions/Data.rst

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

* Update Documentation/Functions/Data.rst

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

* Update Documentation/Functions/Data.rst

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

* Update Documentation/Functions/Data.rst

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

* Apply suggestions from code review

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

* [TASK] Overhaul PAGE chapter

* Use confvals instead of tables
* Correct indentation
* Give headlines to examples
* Introduce a toc for the properties

---------

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

(cherry picked from commit a41daa7)
linawolf added a commit that referenced this pull request Apr 3, 2024
* [TASK] Overhaul data / gettext chapter

* Use confvals instead of aspects
* Correct indentation
* Give headlines to examples
* Some small changes where content didnt make sense

* Update Documentation/Functions/Data.rst

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

* Update Documentation/Functions/Data.rst

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

* Update Documentation/Functions/Data.rst

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

* Update Documentation/Functions/Data.rst

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

* Update Documentation/Functions/Data.rst

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

* Apply suggestions from code review

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

* [TASK] Overhaul PAGE chapter

* Use confvals instead of tables
* Correct indentation
* Give headlines to examples
* Introduce a toc for the properties

---------

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

(cherry picked from commit a41daa7)
@linawolf linawolf added backport-done Changes have been backported to other branches already and removed backport failed labels Apr 3, 2024
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.

2 participants