Hacker News new | past | comments | ask | show | jobs | submit login

Rebases and merges don't work well together. By default, git rebase will get rid of merge commits. While there is an option to preserve merges (-p), it can lead to some strange behaviour while doing an interactive rebase - see BUGS section in git-rebase man page for more details.

I'd also argue that merge and rebase represent fundamental differences in what commits mean. The former being commits are history, and the latter being commits are features.

I'm a pretty basic got user, just wanted to say this was a really useful distinction for me to read.

Guidelines | FAQ | Lists | API | Security | Legal | Apply to YC | Contact