DEV Community 👩‍💻👨‍💻

Discussion on: Rebase or merge

Collapse
michaelhonan profile image
Michael

This.

We have a master and develop branch. And when I'm writing a feature in say... "myBranch". I will rebase develop onto my branch then merge back into develop using git checkout develop; git merge myBranch --no-ff.