logoalt Hacker News

ubercoretoday at 1:43 PM2 repliesview on HN

I've never even seen someone suggest a rebase master onto feature workflow! TIL.


Replies

doolstoday at 1:46 PM

I think the terminology would be the other way around, like you're rebasing the feature onto the main:

git checkout feature

git rebase main

git checkout main

git merge feature

that way you get all your conflicts on the feature branch during rebase and your merge is always clean.

barbazootoday at 2:49 PM

> I get all my conflicts on branches because I rebase before merging

Pretty sure it's the other way around. You're on the branch and rebase it atop current master. If you merge after that, you won't have merge conflicts.