dense stag
Hey I just did a usual squash + merge from my dev branch to main, and there were about a dozen weird merge conflicts, all of which I would've expected to merge automatically. As near as I can tell it was all simple additions/removals from an older version to a new version. ~70% of them were ONLY additions. I've just been working on the single dev branch, haven't touched main since the previous merge.
As an example for why this feels weird, one change I made (within the same commit, iirc) was rewrite about a dozen methods from function my_method() to my_method = function() syntax. Only one of them caused a merge conflict.
I just resolved the conflicts, not really a problem but my lack of git experience (I have a very simple workflow, usually) means I don't know what is causing this or how to search for it, and I'd prefer to avoid it happening again.
My current theory is this is a combination of using squash + this is the second merge I've made from the same dev branch. In which case I will just make a new branch each time to be safe. If that's it I would love an explanation why (if any) and if not please let me know what IS going on. 😅