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)
(where "YOUR CODE" is the code from the branch you were on when you ran `git merge` or `git rebase`)
@b0rk @madewokherd Intuitive is a terrible metric.
But I'm not sure how else it would work? Rebase and merge are opposite directions for integration of changes, and the new, modified, commits are coming from one side or the other and landing on HEAD?
@madewokherd i hear you that you find it intuitive! my feeling is that “this is intuitive behaviour” is an extremely valid but minority opinion