Register a SA Forums Account here!
JOINING THE SA FORUMS WILL REMOVE THIS BIG AD, THE ANNOYING UNDERLINED ADS, AND STUPID INTERSTITIAL ADS!!!

You can: log in, read the tech support FAQ, or request your lost password. This dumb message (and those ads) will appear on every screen until you register! Get rid of this crap by registering your own SA Forums Account and joining roughly 150,000 Goons, for the one-time price of $9.95! We charge money because it costs us money per month for bills, and since we don't believe in showing ads to our users, we try to make the money back through forum registrations.
 
  • Post
  • Reply
poemdexter
Feb 18, 2005

Hooray Indie Games!

College Slice

Seconded.

code:
git config --global rerere.enabled true
Yanked this from the video and shared with a coworker. I never knew this existed and is 100% the most annoying part of getting people to adopt the concept of rebasing because of the "multiple merge conflicts of the same conflict" issue. Even I end up squashing my branch before I rebase because I hate dealing with multiple merge conflicts of the same conflict.

Adbot
ADBOT LOVES YOU

poemdexter
Feb 18, 2005

Hooray Indie Games!

College Slice

Grum posted:

also the length makes the poem 100x better

my wife tells me this all the time.

  • 1
  • 2
  • 3
  • 4
  • 5
  • Post
  • Reply