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

an other part of WOL fixes #2

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

an other part of WOL fixes #2

wants to merge 8 commits into from

Conversation

Pelish
Copy link
Contributor

@Pelish Pelish commented Jan 2, 2012

fixed uninitialized variable in channel struct!

@d1zzy
Copy link
Owner

d1zzy commented Jan 15, 2012

Sorry, I'm still learning this GitHub stuff. For the fixes to the previous commits you sent, couldn't you re-make those commits instead of making new ones on top of them? I guess my concern is to not have wrong commits anywhere in the history. AFAIK in Git to remake commits you can use "git rebase". For example, if I want to edit commits in the last 4 commits in the current branch I do this:
$ git rebase -i HEAD~4

Then, in the editor, I change from "pick" to "edit" every commit which I want to edit. Git will start to replay all those commits and for every commit that was changed to "edit" it will return to the shell so I can update the commit with all the fixes before continuing with "git rebase --continue" (see "man git-rebase").

It might also require to make a new pull request instead of adding to this one. This is why it is recommended to work with many branches in Git. Make a branch each time you're thinking of working on something that you would like me to merge in the official repository. Every time commits need fixed you will have to "git rebase" stuff in that branch and then push the result to your repository and make another pull request.

@Pelish
Copy link
Contributor Author

Pelish commented Jan 17, 2012

Well d1zzy - I will look how to do that, but you should probably reverse all my commite because there may be many possible bugs. In a fact whole wol ladders are mostly an documentation and I will rewrite them. In the end I still need to recode max_packet_len which disabling gameres in current code.

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