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

[CLEANUP] adding & utilising composer sort-packages #788

Merged
merged 2 commits into from
Oct 2, 2019

Conversation

SignpostMarv
Copy link
Contributor

No description provided.

@SignpostMarv SignpostMarv mentioned this pull request Oct 2, 2019
@oliverklee
Copy link
Contributor

@SignpostMarv A request for future commit message (I'll update this PR's message on merging):

After the code for the type of change ([FEATURE], [BUGFIX], [CLEANUP] or [TASK]), please start the commit subject as a continuation of "This commit will …", e.g, "Add …" or "Fix …". Thanks!

@oliverklee oliverklee self-requested a review October 2, 2019 17:18
@oliverklee oliverklee added this to the 4.0.0 milestone Oct 2, 2019
Copy link
Contributor

@oliverklee oliverklee left a comment

Choose a reason for hiding this comment

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

Looks good, thanks!

@oliverklee oliverklee merged commit 9e0bbfe into MyIntervals:master Oct 2, 2019
@SignpostMarv SignpostMarv deleted the composer-sort-packages branch October 2, 2019 17:35
@SignpostMarv
Copy link
Contributor Author

After the code for the type of change ([FEATURE], [BUGFIX], [CLEANUP] or [TASK]), please start the commit subject as a continuation of "This commit will …", e.g, "Add …" or "Fix …". Thanks!

  • [CLEANUP] add package sorting option to composer config
  • [CLEANUP] this commit re-requires a package to enact composer sort-packages

or

  • [CLEANUP] add package sorting option to composer config
  • this commit re-requires a package to enact composer sort-packages

?

@oliverklee
Copy link
Contributor

@SignpostMarv I don't quite understand your question. Maybe an example for a (fictional) single commit message will help:

(Subject) [BUGFIX] Warn if the HTML is empty

(Description) Previously, inlining CSS for empty HTML was possible, although this indicates that the inliner was called with broken data. Now the CssInliner will throw an exception, making it easier to solve the root cause of the empty HTML.

@oliverklee
Copy link
Contributor

@SignpostMarv For more details, I can recommend this blog post: https://chris.beams.io/posts/git-commit/

@SignpostMarv
Copy link
Contributor Author

Maybe an example for a (fictional) single commit message will help:

ah; I very rarely use extended commit messages. there's a butt load of commits coming on the rebased #778 branch:
image

will rebase these once I'm done to reword them appropriately before force-pushing.

@oliverklee
Copy link
Contributor

One-liners are perfectly fine as long as there is nothing useful to add in addition to the commit message subject/heading.

@SignpostMarv
Copy link
Contributor Author

One-liners are perfectly fine as long as there is nothing useful to add in addition to the commit message subject/heading.

mutli-liners when resolving psalm issues may prove useful to those unfamiliar with psalm typehinting syntax.

@JakeQZ
Copy link
Contributor

JakeQZ commented Oct 2, 2019

ah; I very rarely use extended commit messages. there's a butt load of commits coming on the rebased #778 branch:

The title of the initial commit is potentially most important. When squashing-and-merging, we can edit the commit message, but it will typically begin with that from the first commit.

If you encounter any issues rebasing, you might like to reference my post at #373 (comment) for guidance, and possibly @oliverklee's at #708 (comment) if anything goes awry. Thanks again for contributing 🥰

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants