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

workflows/check-by-name: Better error for merge conflicts #259074

Merged
merged 1 commit into from
Oct 6, 2023
Merged

workflows/check-by-name: Better error for merge conflicts #259074

merged 1 commit into from
Oct 6, 2023

Conversation

infinisil
Copy link
Member

Description of changes

Because we can, addresses #256756

Things done

@infinisil infinisil requested review from Mic92, zowoq and a team as code owners October 4, 2023 22:19
@infinisil infinisil added this to the RFC 140 milestone Oct 4, 2023
@infinisil infinisil linked an issue Oct 4, 2023 that may be closed by this pull request
Occasional pkgs/by-name checkout failure #256756
Closed
@infinisil infinisil mentioned this pull request Oct 4, 2023
Closed
@infinisil infinisil merged commit b3e14b9 into NixOS:master Oct 6, 2023
19 checks passed
@infinisil infinisil deleted the detect-merge-conflicts branch October 6, 2023 03:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mic92 Mic92 Awaiting requested review from Mic92 Mic92 is a code owner

@zowoq zowoq Awaiting requested review from zowoq zowoq is a code owner

Assignees
No one assigned
Labels
6.topic: policy discussion 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
RFC 140
Development

Successfully merging this pull request may close these issues.

Occasional pkgs/by-name checkout failure
1 participant
@infinisil