1118
Rebase Supremacy (programming.dev)
submitted 1 year ago by JPDev@programming.dev to c/programmer_humor@programming.dev
233 comments fedilink hide all child comments
you are viewing a single comment's thread
view the rest of the comments
[-] 13@kbin.run 66 points 1 year ago* (last edited 1 year ago)

Imagine rewring history

[-] muad_dibber@lemmygrad.ml 5 points 1 year ago

You try to pull someone's changes, but whoops, they used rebase and rewrote history! Delete the branch and start over.

[-] expr@programming.dev 3 points 1 year ago* (last edited 1 year 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.
load more comments (3 replies)
load more comments (6 replies)
this post was submitted on 04 Apr 2024
1118 points (98.1% liked)

Programmer Humor

24932 readers
1587 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
Feyter@programming.dev
anzo@programming.dev
BurningTurtle@programming.dev
pylapp@programming.dev