DEV Community

loading...

Discussion on: Merge vs rebase

Collapse
leadegroot profile image
Lea de Groot

My rule of thumb is rebase down, merge up
(ie rebase your main branch down onto a feature branch; merge your feature branch up to the main branch)
... except when the rebase is horrible and you are figuring out the same conflicts over and over... then merge down as well!

Collapse
joonhwan profile image
joonhwan • Edited

neat and clean summary!

Collapse
emyller profile image
Evandro Myller Author

I tend to go with merge just for the extra verbosity, e.g. "that's when I brought master (i.e. main branch) onto my branch", and rebase to clean up dirt before pushing. It's not a sacred rule though, exceptions happen!