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

Added basic support for examples #70

Merged
merged 1 commit into from
Sep 21, 2020

Conversation

stefanpieck
Copy link
Contributor

PR related to #64

@bbqsrc
Copy link
Member

bbqsrc commented Sep 21, 2020

Can you rebase and squash all your commits into the Added a simple implementation for examples one? Seems the mut fix is already committed and the short comment is just a fixup.

If you need help with that, just ping me.

@bbqsrc bbqsrc self-requested a review September 21, 2020 13:48
@stefanpieck
Copy link
Contributor Author

Can you rebase and squash all your commits into the Added a simple implementation for examples one? Seems the mut fix is already committed and the short comment is just a fixup.

If you need help with that, just ping me.

Ok, I think I need some assistance for that.
I have never done that before.

@bbqsrc
Copy link
Member

bbqsrc commented Sep 21, 2020

No problem.

First, check that the main branch is up-to-date locally first with a pull. If you cloned the repo before I renamed master to main, git pull --all should grab main.

Then, to do an interactive rebase, after checking out to your feature branch, run git rebase -i main. This will rebase your feature branch against main. It should pop up an editor showing your three commits.

Change it so that only the top commit says pick, and change the others to say squash or s. Save and quit.

Once you've done that you'll get another editor, this time with all the previous commit messages it's going to merge. Delete everything you don't want to keep (which is all of it except for "Added a simple implementation for examples"). Save and quit.

You should now have just one commit on that branch compared with main. 😄

As this is a feature branch, you may safely force-push it and the pull request will automatically detect it.

@bbqsrc
Copy link
Member

bbqsrc commented Sep 21, 2020

Ah, no, you have your own fork that is a few commits behind. To fix this is a bit more than I can explain in comments, I'll rebase it myself this evening and merge it for you. 😄

@stefanpieck
Copy link
Contributor Author

Thank you 😄

@bbqsrc bbqsrc force-pushed the feature/examples_poc branch from eba73b1 to 212408b Compare September 21, 2020 15:08
@bbqsrc bbqsrc merged commit e531d4a into cucumber-rs:main Sep 21, 2020
@bbqsrc
Copy link
Member

bbqsrc commented Sep 21, 2020

Thanks for the contribution. I will make some modifications to this, and report on them in #64.

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.

2 participants