coderjoe

@coderjoe@hachyderm.io

This profile is from a federated server and may be incomplete. Browse more on the original instance.

b0rk, to random
@b0rk@jvns.ca avatar

today I'm thinking about the tradeoffs of using git rebase a bit. I think the goal of rebase is to have a nice linear commit history, which is something I like.

but what are the costs of using rebase? what problems has it caused for you in practice? I'm really only interested in specific bad experiences you've had here -- not opinions or general statements like “rewriting history is bad”

coderjoe,

@b0rk others rebasing have caused me lost commits, difficult diverged histories, complicated mega-commits, difficult PRs, etc...

I treat it as a sort of golden rule since rebasing locally impacts only me, but rebasing remote history impacts everyone else.

That's why I teach how to rebase locally but also teach "never rebase a remote".

I dislike dealing with surprise diverging remotes, so I avoid inflicting them on my peers.

All rules have exceptions of course, but this is my starting point.

kr1573n, to random

I'm going to bed after finishing another Baldur's quest and not starting a new one.

Please clap.

coderjoe,

@kr1573n 👏 👏 👏

coderjoe, to random

I'm so glad that all the hard work going on over at archive.org has finally allowed us to protect future generations from The Terrible Secret of Space...

https://archive.org/details/terriblesecretofspace

  • All
  • Subscribed
  • Moderated
  • Favorites
  • anitta
  • khanakhh
  • thenastyranch
  • Youngstown
  • hgfsjryuu7
  • slotface
  • rosin
  • InstantRegret
  • tacticalgear
  • kavyap
  • osvaldo12
  • everett
  • DreamBathrooms
  • PowerRangers
  • tester
  • magazineikmin
  • Durango
  • mdbf
  • ngwrru68w68
  • modclub
  • cubers
  • vwfavf
  • ethstaker
  • cisconetworking
  • GTA5RPClips
  • normalnudes
  • Leos
  • provamag3
  • All magazines