diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2024-06-21 09:12:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-21 09:12:34 +0200 |
| commit | 73cc4eca564e77121c487e5034f21f0b92c4e467 (patch) | |
| tree | bde6c9612941f5217b205f5456e810d4f6518999 /tests/ui/parser/diff-markers/struct-expr.stderr | |
| parent | 4e6de37349c7838df095b085a2640cb6a007c96a (diff) | |
| parent | 9f6371236f516ac2a883eb8707839ab80fc7f9f7 (diff) | |
Rollup merge of #126125 - dev-ardi:conflict-markers, r=estebank
Improve conflict marker recovery
<!--
If this PR is related to an unstable feature or an otherwise tracked effort,
please link to the relevant tracking issue here. If you don't know of a related
tracking issue or there are none, feel free to ignore this.
This PR will get automatically assigned to a reviewer. In case you would like
a specific user to review your work, you can assign it to them by using
r? <reviewer name>
-->
closes #113826
r? ```@estebank``` since you reviewed #115413
cc: ```@rben01``` since you opened up the issue in the first place
Diffstat (limited to 'tests/ui/parser/diff-markers/struct-expr.stderr')
| -rw-r--r-- | tests/ui/parser/diff-markers/struct-expr.stderr | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/tests/ui/parser/diff-markers/struct-expr.stderr b/tests/ui/parser/diff-markers/struct-expr.stderr index bdea8c841c6..3733cdd3496 100644 --- a/tests/ui/parser/diff-markers/struct-expr.stderr +++ b/tests/ui/parser/diff-markers/struct-expr.stderr @@ -2,17 +2,22 @@ error: encountered diff marker --> $DIR/struct-expr.rs:6:1 | LL | <<<<<<< HEAD - | ^^^^^^^ after this is the code before the merge + | ^^^^^^^ between this marker and `=======` is the code that we're merging into LL | x: 42, LL | ======= - | ------- + | ------- between this marker and `>>>>>>>` is the incoming code LL | x: 0, LL | >>>>>>> branch - | ^^^^^^^ above this are the incoming code changes + | ^^^^^^^ this marker concludes the conflict region | - = 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 - = help: 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> + = 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 |