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 and shorten "Basic Principles" #381

Merged
merged 7 commits into from
Jan 29, 2024
Merged

Conversation

linawolf
Copy link
Member

we had so much, rather insignificant, content here that probably no one was reading it.

we had so much, rather insignificant, content here that probably no one was reading it.
@linawolf linawolf merged commit 19b1d25 into main Jan 29, 2024
@linawolf linawolf deleted the task/reduce-basic branch January 29, 2024 20:31
Copy link
Contributor

The backport to documentation-draft failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 6b2aadd... [TASK] Overhaul and shorten "Basic Principles"
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/BasicPrinciples.rst
CONFLICT (content): Merge conflict in Documentation/BasicPrinciples.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-documentation-draft documentation-draft
# Navigate to the new working tree
cd .worktrees/backport-documentation-draft
# Create a new branch
git switch --create backport-381-to-documentation-draft
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 6b2aadd388bc49f044cea80237cb26eb8dd139df,227f7b5c5a9511626c7cb300d68d65c0df81feb8,a9e04d8ce5319da368018a29886695c0a10c6a0c,61257196e0f645c7b57ed4b58d31226fcbca0f6d,3a2e47d1a3e924aa2ac3141490c41ce05a8c5cdd,fd96876d6c3fda2f37d8da3c6029208d2d1d29aa,99c8b0eb5bdf257575815a95d1cb26d0f354cc06
# Push it to GitHub
git push --set-upstream origin backport-381-to-documentation-draft
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-documentation-draft

Then, create a pull request where the base branch is documentation-draft and the compare/head branch is backport-381-to-documentation-draft.

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