262
When you screw up git (lemmy.zip)
submitted 1 year ago by to c/programmerhumor@lemmy.ml
16 comments fedilink hide all child comments
 
you are viewing a single comment's thread
view the rest of the comments
[–] 8 points 1 year ago (4 children)

Rebase still means you have to resolve conflicts, but it can be worse because you may have to resolve conflicts across multiple commits that you're rebasing on top of a conflict.

  • permalink
  • fedilink
  • source
  • parent
  • hideshow 4 child comments
    •
  • [–] 3 points 1 year ago* (1 child)

    In my experience this can be beneficial when committing and rebasing small and distinct changes.

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

    Agreed. If your commits are reasonably structured, rebasing is far more helpful.

    Although these days I usually opt for one ball-of-mud commit while developing the code, which is always fairly trivial to rebase - only one commit, can't have follow-up issues - and then I redo the commit structure from scratch as a part of preparing the code for the benefit of the reviewer.

  • permalink
  • fedilink
  • source
  • parent