search

chocolatey-community / chocolatey-test-environment

A testing setup related to how the Chocolatey Package Verifier runs testing. Used for manual testing or prior to submission
Apache License 2.0
117 stars 185 forks source link

You didn't have enough cinsts as I said :) #14

Closed majkinetor closed 7 years ago

ferventcoder commented 7 years ago

Can you squash this down to a singular commit? Thanks!

majkinetor commented 7 years ago

I believe its easier for you to do that during merge ?

majkinetor commented 7 years ago

Created new PR for this.

gep13 commented 7 years ago

@majkinetor said... Created new PR for this.

Just for your information, it shouldn't have been necessary to create a new PR. The steps required to do what was being asked can be found here: https://github.com/chocolatey/choco/blob/master/CONTRIBUTING.md#respond-to-feedback-on-pull-request

majkinetor commented 7 years ago

I couldn't get rid of merge commit.

ferventcoder commented 7 years ago

It's almost never necessary to create a new PR - git is a very powerful platform. It actually takes more time to not rebase/squash, plus it reduces conversations/feedback/review in a single place.

For reference - a squash and push takes around 30 seconds.

ferventcoder commented 7 years ago

Ah, never use pull. Almost always you want fetch and rebase.

ferventcoder commented 7 years ago

Pull uses merge - merge should be intentional. Getting the latest changes and syncing your repo should never be a merge. Merge should only be used when you are merging two branches together, like stable -> master or merging a PR.

majkinetor commented 7 years ago

Ah, never use pull. Almost always you want fetch and rebase.

Yeah, I got that after I did it... will have to unlearn pull, will probably take me some time.

Thanks for patience.

ferventcoder commented 7 years ago

It's a learning process. Git is one of those things you pick up new commands for over time. :)