472
History repeats itself (lemmy.world)
submitted 2 years ago by to c/programmer_humor@programming.dev
35 comments fedilink hide all child comments
 
you are viewing a single comment's thread
view the rest of the comments
[–] 3 points 2 years ago (1 child)

Have you tried interactive rebase (rebase -i)? I find it very useful

  • permalink
  • fedilink
  • source
  • parent
  • hideshow 2 child comments
    •
  • [–] 0 points 2 years ago (2 children)

    Yeah, but then you deal with merge conflicts

  • permalink
  • fedilink
  • source
  • parent
  • hideshow 4 child comments
    •
  • [–] 2 points 2 years ago

    rerere is a lifesaver here.

    (I'm also a fan of rebasing; but I also like to land commits that perform a logical and separable chunk of work, because I like history to have decent narrative flow.)

  • permalink
  • fedilink
  • source
  • parent