💭 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 [1]

great poll of git questions

> poll: did you know that in a git merge conflict, the order of the code is different when you do a merge/rebase?
>
> merge:
>
> \ YOUR CODE
> =======
> OTHER BRANCH'S CODE
> >>>>>>> c694cf8aabe
>
> rebase:
>
> OTHER BRANCH'S CODE
> =======
> YOUR CODE
> >>>>>>> d945752 (your commit message)

This one explains a lot. I _think_ 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 `--ours` and `--theirs` flip flops.

!!! note

 This post is a thought [2]. It's a short note that I make
 about someone else's content online #thoughts [3]

References:
[1]: https://jvns.ca/blog/2024/03/28/git-poll-results/
[2]: /thoughts/
[3]: /tags/thoughts/