Rebasing picks commits, merging merges. Unless you're actually trying to merge t...

ddevault on May 10, 2019 | parent | context | favorite | on: Git rebase in depth

Rebasing picks commits, merging merges. Unless you're actually trying to merge two histories, I don't recommend using merge. Just think about what you're logically trying to accomplish and choose that tool.