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.

Sign up for GitHub

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

Jump to bottom

Add support for main branch default #317

Closed
fallion opened this issue Nov 17, 2020 · 1 comment
Closed

Add support for main branch default #317

fallion opened this issue Nov 17, 2020 · 1 comment
Labels
good first issue Good for newcomers help wanted Extra attention is needed

Comments

@fallion
Copy link
Member

fallion commented Nov 17, 2020

Currently commitsar defaults to master branch. Given the recent changes by Github it would be good to also default to main, unless specified differently in .commitsar.yml
@fallion fallion added good first issue Good for newcomers help wanted Extra attention is needed labels Dec 3, 2020
@RobinCsl
Copy link
Contributor

I'll take a stab at this :)

RobinCsl added a commit to RobinCsl/commitsar that referenced this issue Mar 19, 2021
@RobinCsl
feat(config): add commits.upstreamBranch option
67ad313 
The default is still `origin/master` as given by
github.com/aevea/integrations's FindCompareBranch,
but it is now possible to use
```yaml
commits:
  upstreamBranch: origin/main
```
in your `.commitsar.yaml` config file to target
`origin/main` as upstream branch.

It does not quite fix the following related issue
as it proposed to have both `origin/master` and
`origin/main` as default upstream branches, but
it at least offers to configure the upstream
branch as a first step.

Related issue: aevea#317
@RobinCsl RobinCsl mentioned this issue Mar 19, 2021
Merged
RobinCsl added a commit to RobinCsl/commitsar that referenced this issue Mar 19, 2021
@RobinCsl
feat(config): add commits.upstreamBranch option
225c0cd 
The default is still `origin/master` as given by
github.com/aevea/integrations's FindCompareBranch,
but it is now possible to use
```yaml
commits:
  upstreamBranch: origin/main
```
in your `.commitsar.yaml` config file to target
`origin/main` as upstream branch.

It does not quite fix the following related issue
as it proposed to have both `origin/master` and
`origin/main` as default upstream branches, but
it at least offers to configure the upstream
branch as a first step.

Related issue: aevea#317
kodiakhq bot pushed a commit that referenced this issue Mar 22, 2021
@RobinCsl @kodiakhq
feat(config): add commits.upstreamBranch option
73861c5 
The default is still `origin/master` as given by
github.com/aevea/integrations's FindCompareBranch,
but it is now possible to use
```yaml
commits:
  upstreamBranch: origin/main
```
in your `.commitsar.yaml` config file to target
`origin/main` as upstream branch.

It does not quite fix the following related issue
as it proposed to have both `origin/master` and
`origin/main` as default upstream branches, but
it at least offers to configure the upstream
branch as a first step.

Related issue: #317
@fallion fallion closed this as completed Mar 11, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
good first issue Good for newcomers help wanted Extra attention is needed
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@fallion @RobinCsl