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

remove Either, Left, and Right from syntax files #11822

Merged
merged 1 commit into from
Jan 27, 2014
Merged

Conversation

bytbox
Copy link
Contributor

@bytbox bytbox commented Jan 26, 2014

Changes only to src/etc.

@huonw
Copy link
Member

huonw commented Jan 27, 2014

Hm, this PR is confused.

@bytbox it looks like you are working off your master branch for both the removal of do & the (original) contents of this PR, and so the removal of Either never actually landed since you possibly force-pushed do over the top.

In general, I recommend using branches and just keep master as strictly tracing the master branch of the main repository. Feel free to restore the Either removal for a new r+ here, or close this one and open a new PR with a non-master branch.

(Random example of "feature branch" usage of git.)

@bytbox
Copy link
Contributor Author

bytbox commented Jan 27, 2014

Oh, I done goofed... ok, I think I can fix this elegantly.

@bytbox
Copy link
Contributor Author

bytbox commented Jan 27, 2014

I think I got it right. I'll use separate branches for all future changes; thanks.

@huonw
Copy link
Member

huonw commented Jan 27, 2014

Awesome! :)

bors added a commit that referenced this pull request Jan 27, 2014
@bors bors closed this Jan 27, 2014
@bors bors merged commit c60db9b into rust-lang:master Jan 27, 2014
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