<<<<<<< HEAD def parse(input): return input.split("\n") ======= def parse(text): return text.split("\n\n") >>>>>>> d945752 (fix newlines)

Notices where this attachment appears

1. Embed this notice
   Julia Evans (b0rk@social.jvns.ca)'s status on Monday, 11-Mar-2024 22:01:27 JST Julia Evans

   let's imagine you're resolving this merge conflict (in screenshot).

   You've forgotten which code comes from your current branch and which one comes from the "other" branch. How do you figure it out? Do you:

   * remember what the "top" and "bottom" parts correspond to from past merge conflicts?
   * remember what `HEAD` means?
   * read the last line of the merge conflict?
   * run something like `git show main` or `git diff mybranch..main` to see the diff?
   * something else?