2026-09-07 14:36 UTC
if you're dealing with a merge conflict in Git like this, how do you figure out which side the of the conflict comes from which branch? (you can pick more than one)
FRUITS = [
"apple",
>>>>>> add-fruit
"orange",
]
Replies (1)
-
@wingo@mastodon.social 2026-09-07 14:47
@b0rk@social.jvns.ca it's just an awful situation. i keep thinking "does HEAD indicate the change i am attempting to apply, unnamed because it's as-yet uncommitted, or is it just the state of some tree whose name I don't care about"