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

Programmer Humor

19831 readers
255 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 2 years ago
MODERATORS
anzo
Feyter
BurningTurtle
pylapp
1115
Rebase Supremacy (programming.dev)
submitted 8 months ago by JPDev to c/programmer_humor
238 comments fedilink hide all child comments
 
you are viewing a single comment's thread
view the rest of the comments
[–] expr 3 points 8 months ago* (last edited 8 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.