Skip to content

fix: better backport instructions - #168

Merged
krassowski merged 3 commits into
scientific-python:mainfrom
flying-sheep:patch-1
Aug 27, 2026
Merged

fix: better backport instructions#168
krassowski merged 3 commits into
scientific-python:mainfrom
flying-sheep:patch-1

Conversation

@flying-sheep

@flying-sheep flying-sheep commented Aug 27, 2026

Copy link
Copy Markdown
Contributor

The current backport instructions are dangerous since they directly modify the target branch, meaning that I always need to hard reset it after or risk damaging history.

This is a safer version of the same, using a normal PR branch.

Maybe we should change git fetch origin to git fetch upstream?

Fixes #115

@krassowski krassowski left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you! Fixes #115

Comment thread meeseeksdev/meeseeksbox/commands.py Outdated
Updated instructions for backporting conflicts in commands.py.

@krassowski krassowski left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!

Comment thread meeseeksdev/meeseeksbox/commands.py Outdated
Co-authored-by: Michał Krassowski <5832902+krassowski@users.noreply.github.com>
@krassowski
krassowski merged commit 9ae64b7 into scientific-python:main Aug 27, 2026
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Better backport commands

2 participants