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

Added April 2014 Client Packet Data #280

Closed
wants to merge 5 commits into from

Conversation

ThemonChan
Copy link
Contributor

@ThemonChan ThemonChan commented May 3, 2014

@MrKeiKun
Copy link
Contributor

@MrKeiKun MrKeiKun commented May 4, 2014

squash commit if needed <3
👍

guide: http://stackoverflow.com/a/5201642

@MishimaHaruna
Copy link
Member

@MishimaHaruna MishimaHaruna commented May 4, 2014

Yes, please squash, as the pull request can't be merged automatically.

To avoid this:

  1. Never commit anything to master in your repository, or you'll end up with non-fast-forward merges that cause those "Merge branch 'master' of xxxxxxx" commits. If you observe this rule, you can easily use this https://help.github.com/articles/syncing-a-fork to update your fork's master branch.
  2. Always create pull requests from a temporary branch in your repository, not from the master branch. Create the temporary branch after syncing your fork as described above, so that it is the closest possible to the current Hercules repository.
  3. One pull request per branch, and one branch per pull request.

By following those guidelines, you can make sure that your pull requests will be clean of unnecessary commits, and will be possible to merge without conflicts.

@MrKeiKun
Copy link
Contributor

@MrKeiKun MrKeiKun commented May 17, 2014

@MishimaHaruna
Copy link
Member

@MishimaHaruna MishimaHaruna commented May 29, 2014

Merged as 3750df9, thank you all~

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.

None yet

3 participants