Reject merge conflicts #12237
Merged
Reject merge conflicts #12237
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
They're usually found by other checks, but docs would remain susceptible.
roberth
added
backport 2.24-maintenance
|
Open to improvements :) |
This was referenced Jan 12, 2025
mergify bot
added a commit
that referenced
this pull request
Jan 15, 2025
…2237 Reject merge conflicts (backport #12237)
roberth
added
automatic backport
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation
They're usually found by other checks, but docs would remain susceptible.
Context
This was merged: https://github.com/NixOS/nix/pull/12195/files#diff-866a0b8e8c7bbb64f911d2de63f891ffbbcc288e86c666b36c822bb3a7e3cf72
Tested on 2.24-maintenance.
Add 👍 to pull requests you find important.
The Nix maintainer team uses a GitHub project board to schedule and track reviews.