ipconf@lemmy.ml to Programmer Humor@programming.dev · 2 days agoWell well well.lemmy.mlimagemessage-square121fedilinkarrow-up1834arrow-down129file-text
arrow-up1805arrow-down1imageWell well well.lemmy.mlipconf@lemmy.ml to Programmer Humor@programming.dev · 2 days agomessage-square121fedilinkfile-text
minus-squarepanda_abyss@lemmy.calinkfedilinkarrow-up3arrow-down2·2 days agoI’ll get chastised, but when I screw up a rebase I create a backup branch and then have an LLM do the fixing… I’m not proud of it, but I’m a lazy man who doesn’t want to resolve the same conflict 32 times.
minus-squarekibiz0r@midwest.sociallinkfedilinkEnglisharrow-up9·2 days agoHaving to resolve the same conflict multiple times suggests excess noise in your git history. You might want to pay closer attention to creating a useful git history. It’ll help with any future archaeology, and it’ll also help rebasing go smoothly.
I’ll get chastised, but when I screw up a rebase I create a backup branch and then have an LLM do the fixing…
I’m not proud of it, but I’m a lazy man who doesn’t want to resolve the same conflict 32 times.
Having to resolve the same conflict multiple times suggests excess noise in your git history. You might want to pay closer attention to creating a useful git history. It’ll help with any future archaeology, and it’ll also help rebasing go smoothly.