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

doc: add examples in commit message guidelines #131

Merged
merged 1 commit into from
Dec 25, 2021

Conversation

haxscramper
Copy link
Collaborator

@haxscramper haxscramper commented Dec 24, 2021

Add more elaborate examples in the commit message guidelines and pull
requests. Provide reasoning and reformat rules

@haxscramper haxscramper force-pushed the code-guides-2 branch 2 times, most recently from ef0ac47 to 97b60c5 Compare December 24, 2021 12:03
seeing if old issues can be closed with recent changes


Message examples
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Specific examples are up to debate, and I think having more would be beneficial. For now I added a simple example, in future this will be expanded

The `git`:cmd: stuff
====================

PR should contain a single commit
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

More elaborate explanation about reasons and solutions to the "single commit" rule, also need to be checked for sanity.

@@ -45,6 +45,17 @@ Code reviews
When reviewing code it is highly recommended to check whether it complies
with official style guide and point out mismatches.

Prepared replies
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

More replies need to be added here, for now I only added one that links to the commit message guidelines

@haxscramper haxscramper force-pushed the code-guides-2 branch 6 times, most recently from edc7f15 to f5d8112 Compare December 24, 2021 15:37
Copy link
Collaborator

@saem saem left a comment

Choose a reason for hiding this comment

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

This is great. 🥳

Saw a few things you might want to change, please see my comments and suggestions. Thanks for jumping on this right quick.

doc/contributing.rst Outdated Show resolved Hide resolved
doc/contributing.rst Outdated Show resolved Hide resolved
doc/contributing.rst Outdated Show resolved Hide resolved

.. code::

Fixes https://github.com/nim-lang/Nim/issues/19051
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
Fixes https://github.com/nim-lang/Nim/issues/19051
Fixes https://github.com/nim-works/nimskull/issues/19051

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

That one should retain the original url, we don't have a 19k issues at the moment

doc/contributing.rst Outdated Show resolved Hide resolved
- If you need to made some additional modifications (review requested) you
can extend the commit and force-push it (`git commit --amend
--no-edit`:cmd: and `git push --force <remote> <your branch>`:cmd:)
- Create multiple commits and then squash them when your pull request is
Copy link
Collaborator

Choose a reason for hiding this comment

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

Can we elevate this one, it's a nicer flow and less frustrating. It's one of those things where people don't realize they can do this.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

It is more frustrating to do right now, requires digging into multistep git stuff create an intermediate branch. Extending the same commit and force-pushing it is much easier, especially for a small changes, where you just need to correct a couple of lines.

doc/contributing.rst Outdated Show resolved Hide resolved
doc/moderation.rst Outdated Show resolved Hide resolved
Add more elaborate examples in the commit message guidelines and pull
requests. Provide reasoning and reformat rules
@haxscramper
Copy link
Collaborator Author

bors r+

@bors
Copy link
Contributor

bors bot commented Dec 25, 2021

Build succeeded:

@bors bors bot merged commit e447dc4 into nim-works:devel Dec 25, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants