Formed in 2009, the Archive Team (not to be confused with the archive.org Archive-It Team) is a rogue archivist collective dedicated to saving copies of rapidly dying or deleted websites for the sake of history and digital heritage. The group is 100% composed of volunteers and interested parties, and has expanded into a large amount of related projects for saving online and digital history.
Join GitHub today
GitHub is home to over 50 million developers working together to host and review code, manage projects, and build software together.
Sign upsupport "main" as default branch #9
Merged
Conversation
non-breaking as it still falls back on "master"
| @@ -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 | |||
dbushong
Oct 15, 2020
Author
Member
Ran prettier on this (somewhat unintentionally), hence all the formatting changes.
Ran prettier on this (somewhat unintentionally), hence all the formatting changes.
|
|
||
| log('merge-back is clean'); | ||
|
|
||
| if (origBranch !== 'master') await git.checkout(origBranch); | ||
|
|
||
| return true; |
dbushong
Oct 15, 2020
Author
Member
not sure what this was for originally, but tsc didn't like it
not sure what this was for originally, but tsc didn't like it
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.
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