>>105842411
See this is the shit I'm talking about. Should I be required to study astronomy and make my prayers to the earth's great spider king before I begin work? Well fuck that. And for the record I tried different combinations of "theirs" and "ours" and it resulted in git shitting itself and crying once again because merge and rebase for some reason do not support the same strategy set, and nothing I punched in worked.