Skip to content

messages.ftl files are a source of merge conflicts #111847

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
Closed
petrochenkov opened this issue May 22, 2023 · 0 comments · Fixed by #111858
Closed

messages.ftl files are a source of merge conflicts #111847

petrochenkov opened this issue May 22, 2023 · 0 comments · Fixed by #111858
Labels
A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.

Comments

@petrochenkov
Copy link
Contributor

People typically add new diagnostics to the end of these files creating contention.

Maybe diagnostics in such files should be alphabetically sorted to reduce conflicts (and to keep similar diagnostics close to each other).
@petrochenkov petrochenkov added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label May 22, 2023
@petrochenkov petrochenkov changed the title messages.ftl files are a source of merge regressions messages.ftl files are a source of merge conflicts May 22, 2023
@petrochenkov petrochenkov added the A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic label May 22, 2023
@clubby789 clubby789 mentioned this issue May 23, 2023
Merged
@bors bors closed this as completed in c86212f May 26, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

Ensure Fluent messages are in alphabetical order clubby789/rust
1 participant
@petrochenkov