search

todbot / blink1-tool

Command-line tools and C library for blink(1) USB RGB LED
https://blink1.thingm.com/
Other
84 stars 15 forks source link

Merge commits for #38 #40

Closed normanr closed 3 years ago

normanr commented 3 years ago

I thought it might be nice to keep the individual commits for #38 (github seems to have squashed them all into f167eac40e8218f934fb3fa1b11962c17365ec95 as single non-merge commit), thoughts?

todbot commented 3 years ago

Oh sorry, github defaults to "squash and merge" for me. (Another org I'm in prefers that) I can do all your PRs as standard merges if you like.

normanr commented 3 years ago

Heh, now it's a merge of a merge :-)

For smaller projects (where it's possible) I generally prefer rebase and merge (really fast-forward). For larger projects a long term feature branch and plain merge makes more sense to me. I don't really "get" the squash option for merging. The same can be achieved by asking branch authors to rebase their commits before merging a pull request (at the cost of an extra review round trip).