Skip to content

Updated CONTRIBUTING.md#1139

Merged
Ali-RS merged 2 commits into
jMonkeyEngine:masterfrom
Ali-RS:Ali-RS-patch-1
Jul 11, 2019
Merged

Updated CONTRIBUTING.md#1139
Ali-RS merged 2 commits into
jMonkeyEngine:masterfrom
Ali-RS:Ali-RS-patch-1

Conversation

@Ali-RS
Copy link
Copy Markdown
Member

@Ali-RS Ali-RS commented Jul 9, 2019

Added "Customs around integration, branching, tagging, and releases" section to contribution guide.

Added "Customs around integration, branching, tagging, and releases" section to contribution guide.
@stephengold
Copy link
Copy Markdown
Member

I'm in favor of integrating this addition!

Though perhaps we should clarify that the admonition to squash PRs is directed at integrators, not submitters.

@Ali-RS
Copy link
Copy Markdown
Member Author

Ali-RS commented Jul 9, 2019

You mean something like this:

Integrators should note, unless the history of the pull request is important, it should be integrated to a single commit using “squash and merge”. If the history is important, favor “rebase and merge”.
Don’t create a merge commit unless GitHub cannot rebase the PR.

@stephengold
Copy link
Copy Markdown
Member

Yeah, like that. Thanks.

@Ali-RS
Copy link
Copy Markdown
Member Author

Ali-RS commented Jul 10, 2019

Done.

@Ali-RS Ali-RS merged commit 02ccce0 into jMonkeyEngine:master Jul 11, 2019
@Ali-RS Ali-RS deleted the Ali-RS-patch-1 branch July 11, 2019 05:26
@stephengold stephengold added the Documentation Issues that affect the Wiki, Javadoc or any other form of documentation label Mar 13, 2021
@stephengold stephengold added this to the v3.3.0 milestone Mar 13, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Documentation Issues that affect the Wiki, Javadoc or any other form of documentation

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants