search

jescalan / roots

a toolkit for rapid advanced front-end development
http://roots.netlify.com/
Other
1.45k stars 132 forks source link

Use rebase instead of merges. #690

Closed janwirth closed 8 years ago

janwirth commented 8 years ago

Using a rebase instead of a merge when consuming pull requests is a way to maintain a linear commit history

jescalan commented 8 years ago

I like having merges when a branch was merged. It shows a concrete piece of work being done then merged back in. Rebase can keep the timeline and the merge bubbles clean, and each branch should be rebased before being merged, but I do not think just making everything totally flat is a good way to keep track of history.

janwirth commented 8 years ago

Thank you for evaluating. :smile: