Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow upmerging repositories without a master branch #102

Merged
merged 1 commit into from
Mar 19, 2022

Conversation

acrobat
Copy link
Contributor

@acrobat acrobat commented Mar 11, 2022

Q A
Bug fix? no
New feature? yes
BC breaks? no
Deprecations? no
Tickets Fix #...
License MIT

In a repository where I use hubkit on, we don't have a master or main branch but only version branches.

So we have

  • 5.10
  • 6.0
  • 6.1
  • 6.x (which is the main branch where new versions are developed on)

So I've updated the code to include the default branch in list of upmerge branches if it is not already part of it. This way setups with a master default branch (or even the newer main branch) will still work but also support these kind of cases.

@sstok sstok added the Feature label Mar 19, 2022
@sstok sstok merged commit 9b7dd2b into hupkit:1.x Mar 19, 2022
@sstok
Copy link
Member

sstok commented Mar 19, 2022

Thank you @acrobat

@acrobat acrobat deleted the allow-upmerge-without-master-branch branch March 19, 2022 20:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants