merging from picker: raise error if failed and apply merge defaults #658
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
macovsky
commented
Nov 2, 2024
macovsky
force-pushed
the
display-merge-error
branch
from
13c002e to
9a1d830
Compare
macovsky
changed the title
default_merge_method + display error when merging from picker
macovsky
commented
Nov 5, 2024
macovsky
changed the title
add `default_delete_branch` setting which can be overridden with `delete`/`nodelete` argument to `Octo pr merge` also apply all merge defaults when merging from picker
macovsky
force-pushed
the
display-merge-error
branch
from
9a1d830 to
60b4e6b
Compare
pwntester
approved these changes
Nov 5, 2024
pwntester
approved these changes
Nov 5, 2024
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
Octo pr mergedoes)default_delete_branchsetting which can be overridden withdelete/nodeleteargument toOcto pr mergeDoes this pull request fix one issue?
Fixes #657
Describe how to verify it
Octo pr searchfor example (don't open)<C-r>by default)Special notes for reviews
Checklist