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

Feature Request: Better diagnostics for version control conflict marker in file #17446

Closed
Ddystopia opened this issue Jun 18, 2024 · 1 comment
Labels
C-feature Category: feature request

Comments

@Ddystopia
Copy link
Contributor

Hello, clangd is having that feature and it is quite nice:

image

With Rust, while also detecting a marker, it gives a lot of errors that are not helpful and create a messy feeling (nvim-lsp):

Diagnostics:
1. Syntax Error: expected an item [syntax-error]
2. Syntax Error: expected an item [syntax-error]
3. Syntax Error: expected an item [syntax-error]
4. Syntax Error: expected an item [syntax-error]
5. Syntax Error: expected an item [syntax-error]
6. Syntax Error: expected an item [syntax-error]
7. Syntax Error: expected an item [syntax-error]
8. Syntax Error: expected BANG [syntax-error]
9. Syntax Error: expected `{`, `[`, `(` [syntax-error]
10. Syntax Error: expected SEMICOLON [syntax-error]
11. encountered diff marker
    if you're having merge conflicts after pulling new code, the top section is the code you already had and the bottom section is the remote code
    if you're in the middle of a rebase, the top section is the code being rebased onto and the bottom section is the code coming from the current commit being rebased
    for an explanation on these markers from the `git` documentation, visit <https://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging#_checking_out_conflicts>
@Ddystopia Ddystopia added the C-feature Category: feature request label Jun 18, 2024
@Veykril
Copy link
Member

Veykril commented Jun 18, 2024

Duplicate of #7127

@Veykril Veykril marked this as a duplicate of #7127 Jun 18, 2024
@Veykril Veykril closed this as completed Jun 18, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C-feature Category: feature request
Projects
None yet
Development

No branches or pull requests

2 participants