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] Remove Commit Messages conventions #388

Merged
merged 1 commit into from
Jan 30, 2024
Merged

Conversation

linawolf
Copy link
Member

We do not have strict rules for commit messages. Where necessary we can refer to core rules, but we do not need to repeat them here.

We do not have strict rules for commit messages. Where necessary we can refer to core rules, but we do not need to repeat them here.
@linawolf linawolf merged commit b29663d into main Jan 30, 2024
1 check passed
@linawolf linawolf deleted the task/commit-message branch January 30, 2024 17:24
Copy link
Contributor

The backport to documentation-draft failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply cc455b2... [TASK] Remove Commit Messages conventions
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/GeneralConventions/Index.rst
CONFLICT (content): Merge conflict in Documentation/GeneralConventions/Index.rst
Auto-merging Documentation/Maintainers/BackportChanges.rst
Auto-merging Documentation/WritingDocsOfficial/LocalEditing.rst
CONFLICT (content): Merge conflict in Documentation/WritingDocsOfficial/LocalEditing.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-388-to-documentation-draft
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick cc455b21da89b8d321a727a52e849705a146b7c2
# Push it to GitHub
git push --set-upstream origin backport-388-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-388-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