Rebasing about chocolatey-packages

[TomOne]

Not sure what you are trying to say here.

Rebasing is already part of my Git workflow if it’s necessary.

[ferventcoder]

I was looking at the history of this repo. Git fetch && git rebase is always preferred to git pull. That way your commits are always played on top of changes that are already out. It avoids a merge commit that you need to push. And many times merge conflicts. :)

[TomOne]

Sorry, I didn’t know what your policy for this was. From now on I’ll stick to it.

[ferventcoder]

I should really publish my policy somewhere.

• For pulling from upstream (same branch), it is always git fetch && rebase. That way your commits are always played after the commits that were there.
• For merging PRs/branches, it is git merge --no-ff (merge commit is definitely warranted here, it makes a revert so much simpler)
• Never ever force push to main repository
  • but it's not only okay for fork repositories, it's actually warranted. Especially when surrounding PRs. This keeps the discussion all in one place - see puppetlabs/puppet#2817 as an example (note the outdated diff discussion items).