3 ms·
> 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 br
by pandemic_region 2y ago
> 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.
- dools 2y agoI think the commands are: git checkout production git rebase main that gets everything from main into production.
- jakjak123 2y agoThis would rewrite the history for production. Not what you want to do
- LegionMammal978 2y agoThe 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.
- pandemic_region 2y agoYes, 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