Update compiler/rustc_parse/src/parser/diagnostics.rs

Co-authored-by: Esteban Kuber <estebank@users.noreply.github.com>

Author: oriongonza

compiler/rustc_parse/src/parser/diagnostics.rs

@@ -3050,8 +3050,18 @@ impl<'a> Parser<'a> {
         if let Some(end) = end {
             err.span_label(end, "this marker concludes the conflict region");
         }
-        err.help("conflict markers indicate that a merge was started but could not be completed due to merge conflicts");
-        err.help("to resolve a conflict, keep only the code you want and then delete the lines containing conflict markers");
+        err.note(
+            "conflict markers indicate that a merge was started but could not be completed due \
+             to merge conflicts\n\
+             to resolve a conflict, keep only the code you want and then delete the lines \
+             containing conflict markers",
+        );
+        err.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\n\
+             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",
+        );
 
         err.note(
             "for an explanation on these markers from the `git` documentation, visit \