search

aletson / TrinityCore

TrinityCore Open Source MMO Framework
http://www.trinitycore.org
GNU General Public License v2.0
3 stars 1 forks source link

3.3.5 #9

Closed aletson closed 6 years ago

aletson commented 6 years ago

Changes proposed:

Target branch(es): 3.3.5/6.x

Issues addressed: Closes #

Tests performed: (Does it build, tested in-game, etc)

Known issues and TODO list:

NOTE If your Pull Request is ONLY SQL create an issue instead! NOTE You no longer need to squash your commits, on merge we will squash it for you. (GitHub added a new feature)

SUGGESTION If your Pull Request contains SQL give it an impossible date, for example 9999_99_99_99_database.sql. This way it will be free on merge. Myself, i prefer to use 9999_99_99_xxxxx.sql where xxxxx is the id of the pull request, on that way we can merge multiple pull requests containing sql files on a row and rename the files with a single commit.

ghost commented 6 years ago

Out of curiosity, would it not be just as easy to use git to update/merge updates into your 3.3.5 branch? :-)

aletson commented 6 years ago

@tkrokli I'm doing this from my phone

ghost commented 6 years ago

Fair enough. I am thinking maybe I should assist you with getting the 3.3.5 branch here back on track, as long as there is no need for personal commits in the 3.3.5 branch. Your current commit status for the 3.3.5 branch in your repository is this:

This branch is 131 commits ahead, 131 commits behind TrinityCore:3.3.5.

If it had been updated via git, it should look like this:

This branch is even with TrinityCore:3.3.5.

But if you think it is a bad idea, just tell me and I'll leave it as it is. 👍