Comment

Comment by AceJohnny2

I'll add what should be obvious to any seasoned git user: rebase is only possible for "private" commits. If the commits were published, then merge is the only solution, because otherwise with a rebase you will "change (git) history" and break people's repos that have yours as upstream.

I recommend reading this 2008 exchange between top Linux developers learning to use git, and Torvalds's... characteristic language when talking about rebasing a "public" repo:

https://www.yarchive.net/comp/linux/git_rebase.html

(I'm putting "private" and "public" in quotes because they're really on a spectrum)

parent AceJohnny2 2 years ago

Discussion

Live from the official Hacker News API

A modern reader for Hacker News · SvelteKit + Skeleton