search

samuong / alpaca

A local HTTP proxy for command-line tools. Supports PAC scripts and NTLM authentication.
Apache License 2.0
196 stars 35 forks source link

Create CODEOWNERS #19

Closed samuong closed 5 years ago

samuong commented 5 years ago

Now @camh- would say: this is a fixup commit, squash it ;)

I'm wondering whether this project should only allow squash merging, in which case it'll get squashed when I merge this into master. Would be good to get your thoughts. This might require a long discussion :)

juliaogris commented 5 years ago

Yes, that will indeed be a longer discussion. I'll eat my hat if @camh- favours forced squash merges....

On Wed, 28 Aug 2019 at 8:17 pm, samuong notifications@github.com wrote:

Now @camh- https://github.com/camh- would say: this is a fixup commit, squash it ;)

I'm wondering whether this project should only allow squash merging, in which case it'll get squashed when I merge this into master. Would be good to get your thoughts. This might require a long discussion :)

— You are receiving this because you commented.

Reply to this email directly, view it on GitHub https://github.com/samuong/alpaca/pull/19?email_source=notifications&email_token=AAMF3R7VXRCIJXKB6M7IS73QGZGEZA5CNFSM4IRBPMP2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOD5KT3EI#issuecomment-525680017, or mute the thread https://github.com/notifications/unsubscribe-auth/AAMF3RZMWWJHNKI53IVWPADQGZGEZANCNFSM4IRBPMPQ .

camh- commented 5 years ago

I am honoured to be first, but please sort descending by age.

camh- commented 5 years ago

I would be opposed to squash merging as factoring commits is not just useful for review but also for code archaeology, cherry picking, reverting and many other useful features. In these cases you would want to maintain the small commits in master and not squash them. However, I could get on board with squash merging if @juliaogris will make a video of her eating her hat.