3 ms·
> 48% do not know that merge/rebase conflicts have swapped order of local/incoming changes I'm well aware about the differing meaning of HEAD in merge and reba
by nemetroid 2y ago
> 48% do not know that merge/rebase conflicts have swapped order of local/incoming changes
I'm well aware about the differing meaning of HEAD in merge and rebase, and if I had to think about it, would probably realize that it makes sense to always display HEAD first. And that as a consequence, the order would be swapped.
But I would definitely have answered "no" to the question as written.