Tags
Note
This post is a thought. It's a short note that I make about someone else's
content online. Learn more about the process
thoughts
Here's my thought on 💭 Some Git poll results
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:
<<<<<<< HEAD YOUR CODE
OTHER BRANCH'S CODE
c694cf8aabe
rebase:
<<<<<<< HEAD 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.
This post was a thought by Waylon Walker see all my thoughts at https://waylonwalker.com/thoughts