Add --allow-empty flag to merge command #222
Merged
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
|
Looks great! Can you please add a test though, take a look at commands_test.go should be straight forward :) |
|
@mikefarah thanks for the review, I completely missed the I added the test you requested. |
|
Awesome thanks @Ruenzuo - I'll get a release out asap |
|
Has this flag been removed in v3? |
|
@mikefarah Is |
|
@shravanvarma @mrthehud: looking at the code it seems that the |
|
Yeah - there was no reason that I could see not to always allow empty merges |
|
@mikefarah Has this been removed in v4? |
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.
Should fix #205