this post was submitted on 04 Apr 2024
1115 points (98.1% liked)

Programmer Humor

19623 readers
2 users here now

Welcome to Programmer Humor!

This is a place where you can post jokes, memes, humor, etc. related to programming!

For sharing awful code theres also Programming Horror.

Rules

founded 1 year ago
MODERATORS
Feyter@programming.dev
anzo@programming.dev
BurningTurtle@programming.dev
pylapp@programming.dev
1115
Rebase Supremacy (programming.dev)
submitted 7 months ago by JPDev@programming.dev to c/programmer_humor@programming.dev
238 comments fedilink hide all child comments
 
you are viewing a single comment's thread
view the rest of the comments
[–] expr@programming.dev 3 points 7 months ago* (last edited 7 months ago)

2 things:

  1. You don't pull rebased work pretty much ever. Rebasing is for feature branches by a single author to craft a high quality history, generally. It's much, much better than littering your branch with merge commits from upstream.
  2. If for some reason you do need to pull rebased changes, you simply do git pull --rebase. Works without issue.