Skip to content

Conversation

@adrianbrink
Copy link

This is my proposed fix to this.

This is my first PR to such a big project, so any feedback is welcome.

Also, could you point me to where more help is needed with the docs?

r? @steveklabnik
#31242

@rust-highfive
Copy link
Contributor

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @steveklabnik (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

Copy link
Member

Choose a reason for hiding this comment

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

Why this change?

Copy link
Author

Choose a reason for hiding this comment

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

I rearranged the functions a bit to make more sense to me, but I've updated and changed it back.

@adrianbrink
Copy link
Author

Damn it. The last commit wasn't supposed to go here. I wanted to open a new PR for that. Could someone link me a resource on how to achieve that?

@GuillaumeGomez
Copy link
Member

GuillaumeGomez commented Aug 2, 2016

Create a new branch:

git branch new_branch
git checkout new_branch

Now remove the commits you don't want from the commit history (I let you search how it works, I just give you the command):

git rebase -i HEAD~4

Now you have just the commit you want on a new branch called new_branch. You can push it on another branch on your github repo like this:

git push origin HEAD:new_branch

Now let's go back on your previous branch and remove the extra commit:

git checkout master
git rebase -i HEAD~2

Force push the change on your github repo:

git push -f origin HEAD:master

You now have master and new_branch which have different commits. Also, avoid to work on your master branch. It's never a good idea.

Copy link
Member

Choose a reason for hiding this comment

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

You can add it yourself, I can't let this get merged. 😛

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.

4 participants