search

tvkitchen / meta

A meta repository for discussions and tasks that span the project
Apache License 2.0
1 stars 0 forks source link

Merge commit vs rebase #6

Closed slifty closed 4 years ago

slifty commented 4 years ago

To date we have always merged via a merge commit; there is also squash and commit and rebase and commit

We avoided (and will continue to avoid) squash since we have a workflow that prefers atomic commits within PRs; however, I am unfamiliar with the rebase-and-commit approach. Would that allow us to avoid having merge commits?

What are the tradeoffs here? Should we shift to the rebase merge?

slifty commented 4 years ago

Main benefit of merge commit is that we have a distinct message in commit logs that reflect a branch merge. That's enough value for me!