Skip to content

Create template sync PRs from versioned branch#401

Merged
grst merged 6 commits into
mainfrom
fix-396
May 15, 2025
Merged

Create template sync PRs from versioned branch#401
grst merged 6 commits into
mainfrom
fix-396

Conversation

@grst
Copy link
Copy Markdown
Collaborator

@grst grst commented May 8, 2025

Fix #396

Manual intervention required before making a release:

  • for all template repos that merged the v0.5.0 update PR, manually reset the template-update-v2 branch to the last commit created by scverse-bot, effectively removing all commits that were merged in from the main branch.

@github-actions
Copy link
Copy Markdown

github-actions Bot commented May 8, 2025

A PR has been generated to the instance repo:
scverse/cookiecutter-scverse-instance#203

You can check out the PR to preview your changes
in an instance of the cookiecutter template. The PR will be kept in sync with
this PR automatically.

@grst grst requested a review from flying-sheep May 8, 2025 12:04
@grst
Copy link
Copy Markdown
Collaborator Author

grst commented May 8, 2025

As far as I can tell this now does what I think it should.
Example PRs created with the version from this PR:

Note that now the PR is not crated from the template-sync-v2 branch, but from a template-sync-v2-<tag-name> branch.

@flying-sheep
Copy link
Copy Markdown
Member

for all template repos that merged the v0.5.0 update PR, manually reset the template-update-v2 branch to the last commit created by scverse-bot, effectively removing all commits that were merged in from the main branch.

I don’t quite get it, the branches live in here, right? can’t we just nuke all branches from the bot?

@grst
Copy link
Copy Markdown
Collaborator Author

grst commented May 9, 2025

yes, this needs to be done in the bot account.

I think nuking the branches entirely would have the disadvantage that git doesn't know that this branch has already been merged which would lead to merge conflict showing up that have already been resolved (I think).

Copy link
Copy Markdown
Member

@flying-sheep flying-sheep left a comment

Choose a reason for hiding this comment

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

Looks great! I went over it and didn’t find anything that looks wrong.

This was referenced Sep 30, 2025
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.

Template sync v2 removes files from repo

2 participants