Skip to content

grep: Fixed typo in the README #587

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

Merged
merged 1 commit into from
Aug 6, 2018
Merged

Conversation

ZapAnton
Copy link
Contributor

Basically applies #578 for the grep exercise.

It seems like bob was also updated from the latest problem-specification.

It is a minor change, so maybe it is OK to leave it in this PR?

Copy link
Member

@coriolinus coriolinus left a comment

Choose a reason for hiding this comment

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

I plan to merge this on Wednesday unless someone objects.

@petertseng
Copy link
Member

It seems like bob was also updated from the latest problem-specification.
It is a minor change, so maybe it is OK to leave it in this PR?

No, I cannot agree with that. No matter the size of the change, each change should have its own commit so that if I look at the log I can understand why something changed.

I have created #597 . Once it is merged, I request this be rebased so the bob change is no longer in this PR.

@coriolinus
Copy link
Member

@ZapAnton I've merged #597; please rebase this against master branch.

@petertseng
Copy link
Member

petertseng commented Aug 4, 2018

Still awaiting that rebase

(to be clear, the final state should be that only one commit "grep: Fixed typo in the README" appears in https://github.com/exercism/rust/pull/587/commits instead of 22 commits)

@ZapAnton
Copy link
Contributor Author

ZapAnton commented Aug 5, 2018

I think i messed this one a bit and now cannot find the right solution.

After @coriolinus requested the rebase I pulled the latest changes to master branch, rebased
the grep_update branch (this PR branch) against master, made a pull from remote grep_update
merged the changes and pushed the changes to the remote grep_update. What was the wrong part?

@coriolinus if you have moment, can you give me a hint about a proper steps to finish this PR?
If this takes too much time, perhaps you could close this PR, and I would open another one with more clear changes.

Sorry for the inconvenience.

@coriolinus
Copy link
Member

@ZapAnton I've rebased this for you. This is the sequence of commands I used:

git checkout master  # exit the branch I had been on
git pull exercism master  # update master from exercism
git fetch zapanton  # fetch the list of branches you have active
git checkout grep_update  # check out this branch
git rebase master  # rebase against the most current master
git log --graph --decorate --oneline  # demonstrate that there's only one commit past master
git push -f  # force-push the branch to update the PR

@ZapAnton
Copy link
Contributor Author

ZapAnton commented Aug 6, 2018

Thanks.
Missed the force-push step in my solution

@coriolinus coriolinus merged commit 904db58 into exercism:master Aug 6, 2018
@ZapAnton ZapAnton deleted the grep_update branch August 6, 2018 19:05
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.

3 participants