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

Merge strategy doesn't work with bors-ng using .gitattributes #512

Open
lan-nguyen91 opened this issue Oct 6, 2018 · 3 comments

Comments

@lan-nguyen91
Copy link

commented Oct 6, 2018

I want to merge README.md using .gitattributes

README.md merge=union

but right now Bors is using GitHub API which will never support merge strategy.
Is there a way to overcome this issue, like using local git ?

thanks

@notriddle

This comment has been minimized.

Copy link
Member

commented Oct 6, 2018

Bors doesn't currently support local merge. I'm not averse to adding an option for it, but it'll never be enabled on the public interface (for the same reason GitHub won't do it; I don't want to spend the money on cloning everyone's repositories).

kimsaehun pushed a commit to kimsaehun/bors-ng that referenced this issue Oct 7, 2018

Merge bors-ng#474
474: Bump hackney from 1.12.1 to 1.14.0 r=notriddle a=dependabot[bot]

Bumps [hackney](https://github.com/benoitc/hackney) from 1.12.1 to 1.14.0.
<details>
<summary>Changelog</summary>

*Sourced from [hackney's changelog](https://github.com/benoitc/hackney/blob/master/NEWS.md).*

> 1.14.0 - 2018-09-12
> -------------------
> 
> - bump to certifi 2.4.2
> - bump to idna 0.6.0
> - fix support of rebar2
> - fix specs
> - add `hackney:sockname/1` adn `hackney:peername/1` functions
> - add new `checkout_timeout` option for clarity
> - improve `hackney_url:parse_qs/1` to trim leading and trailing empty values
> 
> 
> 1.13.0 - 2018-06-22
> -------------------
> 
> - fix compatibility with Erlang/OTP 21
> - fix parsing query parameters on url without path ([bors-ng#512](https://github-redirect.dependabot.com/benoitc/hackney/issues/512))
> - bump idna to 1.5.2: fix compatibility with rebar2 ([bors-ng#509](https://github-redirect.dependabot.com/benoitc/hackney/issues/509))
> - fix accessing HTTPS sites with an IP address ([bors-ng#494](https://github-redirect.dependabot.com/benoitc/hackney/issues/494))
</details>
<details>
<summary>Commits</summary>

- [`aa41e75`](benoitc/hackney@aa41e75) bump to 1.14.0
- [`63f1d15`](benoitc/hackney@63f1d15) Merge branch 'master' of github.com:benoitc/hackney
- [`b98f89d`](benoitc/hackney@b98f89d) (fix) [bors-ng#521](https://github-redirect.dependabot.com/benoitc/hackney/issues/521) trim leading and trailing empty values in parse_qs ([bors-ng#523](https://github-redirect.dependabot.com/benoitc/hackney/issues/523))
- [`cf15810`](benoitc/hackney@cf15810) (feat) Support 'checkout_timeout' option ([bors-ng#520](https://github-redirect.dependabot.com/benoitc/hackney/issues/520))
- [`499de03`](benoitc/hackney@499de03) sockname and peername access from hackney module ([bors-ng#504](https://github-redirect.dependabot.com/benoitc/hackney/issues/504))
- [`1e30cee`](benoitc/hackney@1e30cee) Fix invalid type for hackney_ur:qs/2 options
- [`4a828f9`](benoitc/hackney@4a828f9) test erlang 21
- [`29910e5`](benoitc/hackney@29910e5) fix specs
- [`c6e4ad0`](benoitc/hackney@c6e4ad0) Merge pull request [bors-ng#516](https://github-redirect.dependabot.com/benoitc/hackney/issues/516) from sborrazas/qs_opts_type
- [`cd8f916`](benoitc/hackney@cd8f916) test erlang 21
- Additional commits viewable in [compare view](benoitc/hackney@1.12.1...1.14.0)
</details>
<br />

[![Dependabot compatibility score](https://api.dependabot.com/badges/compatibility_score?dependency-name=hackney&package-manager=hex&previous-version=1.12.1&new-version=1.14.0)](https://dependabot.com/compatibility-score.html?dependency-name=hackney&package-manager=hex&previous-version=1.12.1&new-version=1.14.0)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

---

**Note:** This repo was added to Dependabot recently, so you'll receive a maximum of 5 PRs for your first few update runs. Once an update run creates fewer than 5 PRs we'll remove that limit.

You can always request more updates by clicking `Bump now` in your [Dependabot dashboard](https://app.dependabot.com).

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot ignore this [patch|minor|major] version` will close this PR and stop Dependabot creating any more for this minor/major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
- `@dependabot use these labels` will set the current labels as the default for future PRs for this repo and language
- `@dependabot use these reviewers` will set the current reviewers as the default for future PRs for this repo and language
- `@dependabot use these assignees` will set the current assignees as the default for future PRs for this repo and language
- `@dependabot use this milestone` will set the current milestone as the default for future PRs for this repo and language
- `@dependabot badge me` will comment on this PR with code to add a "Dependabot enabled" badge to your readme

Additionally, you can set the following in your Dependabot [dashboard](https://app.dependabot.com):
- Update frequency (including time of day and day of week)
- Automerge options (never/patch/minor, and dev/runtime dependencies)
- Pull request limits (per update run and/or open at any time)
- Out-of-range updates (receive only lockfile updates, if desired)
- Security updates (receive only security updates, if desired)

Finally, you can contact us by mentioning @dependabot.

</details>

Co-authored-by: dependabot[bot] <support@dependabot.com>

@lan-nguyen91 lan-nguyen91 reopened this Oct 16, 2018

@lan-nguyen91

This comment has been minimized.

Copy link
Author

commented Oct 16, 2018

hi @notriddle,

Can you help pointing me to the code that does the merging and how would I add option to do this.
basically will be using local git and pull the code down and do the merging, but I'm not familiar with elixer so some guidance will def help.
I can contribute making pr, if I can get this up running. Apparently lots of people running into this same changelog issue, so it would be super useful.

I know public interface is a lot to ask, but I think people who are willing to spin up bors will appreciate this feature.

@notriddle

This comment has been minimized.

Copy link
Member

commented Oct 16, 2018

There's a couple of places worth looking at:

Note that, by using a local Git clone to perform the merge, you'll also be able to eliminate staging.tmp, and to use the actual GitHub Octopus Merge interface, instead of my half-baked reimplementation using the raw Git Data API (see GitHub.synthesize_commit).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.