I've been a professional C, Perl, PHP and Python developer.
I'm an ex-sysadmin from the late 20th century.
These days I do more Javascript and CSS and whatnot, and promote UX and accessibility.
I've never used this. I remember (I think?) reading about it a long time ago but it's just one of those things I've never done. Like how using bisect is a great idea but unless you have a quick way of testing whether the branch is good or bad it can take longer than eyeballing the code at random commits.
BTW, I think you missed a newline in your git checkout --ours . git merge --continue - like I say, I've not used it but I'm assuming you can't chain commands on one line like that.
👋 Hey there, I am Waylon Walker
I am a Husband, Father of two beautiful children, Senior Python Developer currently working in the Data Engineering platform space. I am a continuous learner, and sha
thanks for highlighting that. I write with hardwraps and have a tool to unrap as dev does not like hardwraps, and sometimes a codeblock sneaks in and gets wrapped.
👋 Hey there, I am Waylon Walker
I am a Husband, Father of two beautiful children, Senior Python Developer currently working in the Data Engineering platform space. I am a continuous learner, and sha
I've never used this. I remember (I think?) reading about it a long time ago but it's just one of those things I've never done. Like how using
bisectis a great idea but unless you have a quick way of testing whether the branch is good or bad it can take longer than eyeballing the code at random commits.BTW, I think you missed a newline in your
git checkout --ours . git merge --continue- like I say, I've not used it but I'm assuming you can't chain commands on one line like that.thanks for highlighting that. I write with hardwraps and have a tool to unrap as dev does not like hardwraps, and sometimes a codeblock sneaks in and gets wrapped.
It's one of those things that is super handy when you need it.