> 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.
Did you mean rebase production onto main rather? Or do I have my branches and trees mixed up.
git checkout production
git rebase main
that gets everything from main into production.
git rebase (current branch onto) main