Skip to content

Conversation

@mricherzhagen
Copy link
Contributor

PR Description

Sometimes it is permissible/required to fixup a commit, even though it is already on the main branch. Even if it is not permissible it might be useful information which commit would have to be changed.

This PR changes the ctrl-f function to instead of showing an error when the commit is already merged to only show a confirmation warning.

Please check if the PR fulfills these requirements

  • Cheatsheets are up-to-date (run go generate ./...)
  • Code has been formatted (see here)
  • Tests have been added/updated (see here for the integration test guide)
  • Text is internationalised (see here)
  • If a new UserConfig entry was added, make sure it can be hot-reloaded (see here)
  • Docs have been updated if necessary
  • You've read through your own file changes for silly mistakes etc

@mricherzhagen
Copy link
Contributor Author

This PR now shares a commit with #5201 that moves the creation of the Handler function into a helper function.

@mricherzhagen mricherzhagen force-pushed the allow_fixup_helper_on_main branch from 9328219 to dff66dc Compare January 12, 2026 14:59
@mricherzhagen mricherzhagen changed the title Allow the fixup helper to return commits on the main branch with a warning. feat: Allow the fixup helper to return commits on the main branch with a warning. Jan 12, 2026
@mricherzhagen mricherzhagen force-pushed the allow_fixup_helper_on_main branch from dff66dc to 3ebecf6 Compare January 12, 2026 15:23
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.

1 participant