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.

Sign up for GitHub

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

Jump to bottom

Fix null expression #2189

Merged
merged 1 commit into from
Jun 17, 2013
Merged

Fix null expression #2189

merged 1 commit into from
Jun 17, 2013

Conversation

WalterBright
Copy link
Member

This was causing #2146 to fail.

@WalterBright
Copy link
Member Author

Looks like all those git reset hard commands do not work. Once again, my PR is full of crap.

@dnadlinger
Copy link
Member

How did you create that branch?

@WalterBright
Copy link
Member Author

I did as you said, git reset --hard origin/master. Then I did a git pull upstream on it. Then I branched, added the commit, and pushed the branch to origin.

@dnadlinger
Copy link
Member

@WalterBright: If upstream is the remote name for D-Programming-Language/dmd, then you want to do git reset --hard upstream/master – seems like origin points to your personal GitHub fork, and that one already has the bad commits on master.

@WalterBright WalterBright mentioned this pull request Jun 16, 2013
Closed
donc pushed a commit that referenced this pull request Jun 17, 2013
Merge pull request #2189 from WalterBright/fix_null_expression
2aaa85e 
Fix null expression
@donc donc merged commit 2aaa85e into dlang:master Jun 17, 2013
@WalterBright WalterBright deleted the fix_null_expression branch June 17, 2013 09:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@WalterBright @dnadlinger @donc