Repository navigation
git-node: message to do rebase/am before final - #286
Merged
Merged
Conversation
Codecov Report
@@ Coverage Diff @@
## master #286 +/- ##
=======================================
Coverage 74.03% 74.03%
=======================================
Files 22 22
Lines 1406 1406
=======================================
Hits 1041 1041
Misses 365 365Continue to review full report at Codecov.
|
joyeecheung
reviewed
Oct 4, 2018
| if (!this.readyToFinal()) { // check git rebase/am has been done | ||
| cli.warn('Not yet ready to final'); | ||
| cli.log('A git rebase/am is in progress.' + | ||
| ' Please complete it before running final'); |
Member
There was a problem hiding this comment.
s/running final/running git node land --final/
joyeecheung
approved these changes
Oct 5, 2018
priyank-p
approved these changes
Oct 5, 2018
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
The command final fails if am/rebase is in progress:
node-core-utils/lib/session.js
Lines 184 to 189 in c848152
This PR adds a message to inform the user to complete exiting am/rebase before running final