News for hackers. Stuff that matters.
Re:Resistance against London tube map commit history (a.k.a.... by pandemic_region on Wednesday May 01, 2024 @07:36AM (#40221908)
> But that resulted in merge hell until I learned I could just rebase main onto production.

Did you mean rebase production onto main rather? Or do I have my branches and trees mixed up.

Re:Resistance against London tube map commit history (a.k.a.... by dools on Wednesday May 01, 2024 @07:46AM (#40221956)
I think the commands are:

git checkout production

git rebase main

that gets everything from main into production.

Re:Resistance against London tube map commit history (a.k.a.... by pandemic_region on Wednesday May 01, 2024 @08:47AM (#40222406)
Yes, but rebase is like rebranch. So you take a branch from a tree, and plant it on top of a new tree. So, you rebranch (rebase) production branch on top of the main branch.

git rebase (current branch onto) main

Re:Resistance against London tube map commit history (a.k.a.... by jakjak123 on Saturday May 04, 2024 @11:25AM (#40258336)
This would rewrite the history for production. Not what you want to do
Re:Resistance against London tube map commit history (a.k.a.... by LegionMammal978 on Saturday May 04, 2024 @12:10PM (#40258605)
The point, as I understand it, is that production has no meaningful history separate from main's history: it acts as a bare pointer, and rebasing it just fast-forwards it to later points in main's history.