Per Game CHEATS should be good now ...

[BatRastard]

Checklists for Pull requests

About pull request itself:

• I am submitting a pull request:)
• My submission does one logical thing only (one bugfix, one new feature). If I will want to supply multiple logical changes, I will submit multiple pull requests.

Code quality:
(not applicable for non-code fixes of course)

• My submission follow coding style of file (or follow this coding style guide https://www.kernel.org/doc/Documentation/CodingStyle)
• My submission is passing local test suite

Commits:

• My commits are logical, easily readable, with concise comments.
• My commits follow the KISS principle: do one thing, and do it well.

Licensing:

• I am the author of submission or have been authorized by submission copyright holder to issue this pull request.

Branching:

• My submission is based on master branch.
• My submission is compatible with latest master branch updates (no conflicts, I did a rebase if it was necessary).
• The name of the branch I want to merge upstream is not 'master' (except for only the most trivial fixes, like typos and such).
• My branch name is feature/my-shiny-new-opl-feature-title (for new features).
• My branch name is bugfix/my-totally-non-hackish-workaround (for bugfixes).
• My branch name is doc/what-i-did-to-documentation (for documentation updates).

Continuous integration:

• [TODO] Once I will submit this pull request, I will wait for Travis-CI report (normally a couple of minutes) and fix any issues I might have introduced.
• [TODO] Until TravisCI not is configured, you can configure and run TravisCI https://travis-ci.org/, it alrealdy have a working template.

Pull request description

Per Game CHEATS should be working now ...

[doctorxyz]

Git is warning that "This branch cannot be rebased due to conflicts"... So I will choose squash and merge instead.... Let's go!

[Caio99BR]

Why you merged?
This have many commits for one thing, it NOT follow KISS principle :(
Please @BatRastard make it with only one commit, rebase do any thing, and
@doctorxyz NEVER merge a pull request with merge commits inside, NEVER, it
corrupt git history and add unnecessary revisions.
Em seg, 24 de out de 2016 04:47, doctorxyz [email protected]
escreveu:

Merged #14 #14.

—
You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub
#14 (comment), or mute
the thread
https://github.com/notifications/unsubscribe-auth/AG8XF37guaQ1dWeDc9kZl0eWIhKvMz0Iks5q3FR4gaJpZM4KeYdm
.

[uyjulian]

@Caio99BR It's been "squashed", so the history is merged into one commit.

Of course, this removes PGP signatures and original commit hashes from the history...

[doctorxyz]

Thanks for increasing my knowledge.

[BatRastard]

It added 12 fucking unnecessary revisions facepalm

Who gives a rat's monkey's fuck?!? Seriously, this entire project is loaded with "fucking unnecessary commits" where a developer forgot a pound sign, a semi-colon, a terminator, etc. AND THAT'S JUST THE GOD DAMNED MAKEFILE!!! I've seen 'em forget entire headers before. And I won't even mention how many times Hominem or myself had to push a commit just to change a "1" back to "0". I have low tolerance for asshole technocrats who freebase their own malignant narcissism, especially when they insist on foisting their "clean code" bongwater on me, too. Leave me the hell out of it. At the rate of frustration I have lately, there's only one KISS principle you and Github need to follow ... and it involves my ass. Pucker long. Pucker often ...

[Jay-Jay-OPL]

@BatRastard , my pal, my buddy, please don't quit, please have more patience, Things will iron out soon. :)

[doctorxyz]

Gentlemen, I'll keep using Rebase and Merge until someones gives me a better way. Take in account I am always eager to learn new stuff (but someone should explain first). Thanks in advance.

[uyjulian]

Rebase and merge is fine