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

Remove reference to Bors-NG as it is deprecated in favor in github merge queue #115

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove reference to Bors-NG as it is deprecated in favor in github merge queue #115

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion content/deciding-factors/index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ this way without encountering the same problem. This is known as the "race to pu
Fork-based "pull requests" and similar branch-based "merge requests" in hosted git services solve this to a degree, with robots
keeping pull-request branches abreast of `origin:main` automatically as long as no conflicts arise.

If you are using Github as your repository host, there is a tool that can help solve the "race to push" problem. It is called Bors-NG{{< ext url="https://github.com/bors-ng/bors-ng" >}} and it is a merge bot for GitHub pull requests. It will take care of merging the latest trunk version into your branch, running all needed tests and merging the result back into the trunk, managing this as a queue and removing these race conditions.
If you are using Github as your repository host, [Github Merge Queue](https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-a-merge-queue) can help solve the "race to push" problem. This will automate pull request merges into a busy branch to increase velocity.

Even with Pull Requests, however, very high commit frequencies to the shared repo means contention and an artificial
serialization. Microsoft acknowledged this as one
Expand Down