rust/tests/ui/parser/diff-markers/statement.stderr

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

24 lines
1.1 KiB
Plaintext
Raw Normal View History

error: encountered diff marker
--> $DIR/statement.rs:10:1
|
LL | <<<<<<< HEAD
2024-06-07 09:25:43 -05:00
| ^^^^^^^ between this marker and `=======` is the code that we're merging into
LL | S::foo();
LL | =======
2024-06-07 09:25:43 -05:00
| ------- between this marker and `>>>>>>>` is the incoming code
LL | S::bar();
LL | >>>>>>> branch
2024-06-07 09:25:43 -05:00
| ^^^^^^^ this marker concludes the conflict region
2022-12-28 20:46:20 -06:00
|
2024-06-07 09:25:43 -05:00
= note: conflict markers indicate that a merge was started but could not be completed due to merge conflicts
to resolve a conflict, keep only the code you want and then delete the lines containing conflict markers
= help: 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
= note: 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>
error: aborting due to 1 previous error