Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update CONTRIBUTING.rst, add issue and PR templates #2673

Merged
merged 2 commits into from Feb 19, 2017
Merged

Conversation

Kwpolska
Copy link
Member

  • Minor copyediting and content updates for CONTRIBUTING.rst.
  • Issue template which asks for environment information.
  • PR template which tells people about CONTRIBUTING.rst and what they need to do

Signed-off-by: Chris Warrick <kwpolska@gmail.com>
``git pull``, please run ``git config pull.rebase true`` to prevent merges
from happening and replace them with rebase goodness. There is also an
“emergency switch” in case rebases fail and you do not know what to do:
``git pull --no-rebase``.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did you remove this part about rebasing? I've always used Nikola's CONTRIBUTING.rst file to look this up when I forgot how to change the pull.rebase settings, so I will definitely miss this part ;-)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

added back and reworded.

Signed-off-by: Chris Warrick <kwpolska@gmail.com>
Copy link
Contributor

@felixfontein felixfontein left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@Kwpolska Kwpolska merged commit 90ccf74 into master Feb 19, 2017
@Kwpolska Kwpolska deleted the contributing branch February 19, 2017 16:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants