Some Git poll results
━━━━━━━━━━━━━━━━━━━━━

!https://jvns.ca/blog/2024/03/28/git-poll-results/

Date: March 29, 2024

Some Git poll results Some Git poll results Julia Evans · jvns.ca

great poll of [4m[38;2;248;248;242mgit[0m <[38;2;248;248;242m/glossary/git/[0m> questions

[38;2;248;248;242m│ [0mpoll: did you know that in a git merge conflict, the order of the code is different when you do a merge/rebase?
[38;2;248;248;242m│ [0m
[38;2;248;248;242m│ [0mmerge:
[38;2;248;248;242m│ [0m
[38;2;248;248;242m│ [0m[1m[38;2;189;147;249m<<<<<<< HEAD YOUR CODE[0m
[38;2;248;248;242m│ [0m[38;2;68;71;90m━━━━━━━━━━━━━━━━━━━━━━[0m
[38;2;248;248;242m│ [0m
[38;2;248;248;242m│ [0mOTHER BRANCH’S CODE
[38;2;248;248;242m│ [0m
[38;2;248;248;242m│ [0m[38;2;248;248;242m│ [0m[38;2;248;248;242m│ [0m[38;2;248;248;242m│ [0m[38;2;248;248;242m│ [0m[38;2;248;248;242m│ [0m[38;2;248;248;242m│ [0m[38;2;248;248;242m│ [0mc694cf8aabe
[38;2;248;248;242m│ [0m
[38;2;248;248;242m│ [0mrebase:
[38;2;248;248;242m│ [0m
[38;2;248;248;242m│ [0m[1m[38;2;189;147;249m«««< HEAD OTHER BRANCH’S CODE[0m
[38;2;248;248;242m│ [0m[38;2;68;71;90m━━━━━━━━━━━━━━━━━━━━━━━━━━━━━[0m
[38;2;248;248;242m│ [0m
[38;2;248;248;242m│ [0mYOUR CODE
[38;2;248;248;242m│ [0m
[38;2;248;248;242m│ [0m[38;2;248;248;242m│ [0m[38;2;248;248;242m│ [0m[38;2;248;248;242m│ [0m[38;2;248;248;242m│ [0m[38;2;248;248;242m│ [0m[38;2;248;248;242m│ [0m[38;2;248;248;242m│ [0md945752 (your commit message)

This one explains a lot. I [3mthink[0m I knew this, I might have seen it somewhere, but I have definitely noticed it go both ways and confuse the crap out of me. Feels very similar to how [38;2;189;147;249m--ours[0m and [38;2;189;147;249m--theirs[0m flip flops.