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

Document std.stream.FileMode enum #417

Closed
wants to merge 2 commits into from
Closed

Document std.stream.FileMode enum #417

wants to merge 2 commits into from

Conversation

ghost
Copy link

@ghost ghost commented Feb 5, 2012

This pull request documents the std.stream.FileMode enum that is thoroughly used in the [std.stream](http://dlang.org/phobos/std_stream.html module, but is not visible in the html page.

Although std.stream will be revamped/rewritten in D2, in D1 is still in use, so I think that is valid to make pull request for the old version. Moreover if there's no definitive date for the new stream version.

This partially fixes the issue 1726: std.stream FileMode documentation problems.

@ghost
Copy link
Author

ghost commented Feb 5, 2012

Curses! the first commit f107338 shouldn't have been pulled. Do I close this pull and retry?

@yebblies
Copy link
Member

yebblies commented Feb 5, 2012

Just do:

git checkout -b newbranch
git rebase -i master

(remove the line that corresponds to the commit you don't want any more)

git push origin newbranch::std-stream-filemode-docs

@ghost
Copy link
Author

ghost commented Feb 5, 2012

Sigh.

error: failed to push some refs to 'git@github.com:YaoGomez/phobos.git' To prevent you from losing history, non-fast-forward updates were rejected Merge the remote changes (e.g. 'git pull') before pushing again.

I don't know what happened. I always do another branch for each independent pull.

@yebblies
Copy link
Member

yebblies commented Feb 5, 2012

Oops, that was my mistake, it just doesn't like pushing after you rebase.

Use git push origin newbranch::std-stream-filemode-docs -f to make it do it anyway.

@ghost
Copy link
Author

ghost commented Feb 5, 2012

Nope. Now I'm getting some local errors. I'm going to close this and check what's going on. Thanks for the help anyways.

@ghost ghost closed this Feb 5, 2012
This pull request was closed.
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.

1 participant