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:

1. remember what the "top" and "bottom" parts correspond to from past merge conflicts?
2. remember what `HEAD` means?
3. read the last line of the merge conflict?
4. run something like `git show main` or `git diff mybranch..main` to see the diff?
5. enable diff3
6. something else?

Follow

@b0rk I do your #4: run git diff to see what each one changed. If it’s not obvious which one of the options is correct, I want to see the whole change to put each option in context, even if other parts merged cleanly.

Sign in to participate in the conversation
Mastodon

The social network of the future: No ads, no corporate surveillance, ethical design, and decentralization! Own your data with Mastodon!