feat: Add default merge method #489
Merged
+16
−1
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This commit adds a new option `default_merge_method`, which can be used to define the default merge method for the `Octo pr merge` command. Until now the `Octo pr merge` was always using `commit` when no argument was defined. This can now be customized by the user. A user can select between `commit`, `rebase` and `squash`.
pwntester
approved these changes
Jan 24, 2024
|
Looks great, thanks for the contribution! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Describe what this PR does / why we need it
This commit adds a new option
default_merge_method, which can be used to define the default merge method for theOcto pr mergecommand.Until now the
Octo pr mergewas always usingcommitwhen no argument was defined. This can now be customized by the user. A user can select betweencommit,rebaseandsquash. If another string is provided it will fallback tocommit.This is especially useful (at least for me 😅) when the
enable_builtinoption is enabled and the merge command is selected via Telescope where it isn't possible to provide the merge method.Does this pull request fix one issue?
NONE
Special notes for reviews