807
Well well well. (lemmy.ml)
submitted 1 year ago by to c/programmer_humor@programming.dev
130 comments fedilink hide all child comments
 

Yeah learned this the hard way.

you are viewing a single comment's thread
view the rest of the comments
[–] 0 points 1 year ago (1 child)

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.

  • permalink
  • fedilink
  • source
  • parent
  • hideshow 1 child comment
    •
  • [–] 9 points 1 year ago

    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.

  • permalink
  • fedilink
  • source
  • parent