support "main" as default branch #9
Merged
+332
−245
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
non-breaking as it still falls back on "master"
dbushong
commented
Oct 15, 2020
| @@ -1,16 +1,22 @@ | |||
| # Branch Workflow CLI | |||
|
|
|||
| A cli that provides a set of `git wf` subcommands which simplify dealing with | |||
| feature branches & GitHub pull requests. Does not require a GH API token, as | |||
| feature branches & GitHub pull requests. Does not require a GH API token, as | |||
There was a problem hiding this comment.
Ran prettier on this (somewhat unintentionally), hence all the formatting changes.
dbushong
commented
Oct 15, 2020
|
|
||
| log('merge-back is clean'); | ||
|
|
||
| if (origBranch !== 'master') await git.checkout(origBranch); | ||
|
|
||
| return true; |
There was a problem hiding this comment.
not sure what this was for originally, but tsc didn't like it
jkrems
approved these changes
Oct 23, 2020
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.
This change is non-breaking as it still falls back on "master".
A number of projects are switching to using "main" as their default branch; this change supports "main" if that branch exists, and falls back on "master" if it doesn't. (But you have to have one of them)
Keeping in the spirit of this tool's zero-configuration and opinionated branch naming, it does not support any arbitrary main branch, just those two.
This PR was started by: git wf pr