search

Redot-Engine / redot-docs

Redot Engine official documentation
https://docs.redotengine.org/
Other
62 stars 15 forks source link

Determine squashing policy when syncing from upstream fork #49

Closed adikhoff closed 4 hours ago

adikhoff commented 5 hours ago

We normally squash every PR but I think in this case we should keep the history intact.

Specifically referring to https://github.com/Redot-Engine/redot-docs/pull/44

Spartan322 commented 4 hours ago

It is necessary in fact for the merge from upstream not to be squashed in order to minimize conflicts and the chance git will complain. In every other case it should be squashed.

adikhoff commented 4 hours ago

Thank you