ttutisani / Xunit.Gherkin.Quick

BDD in .NET Core - using Xunit and Gherkin (compatible with both .NET Core and .NET)
MIT License
205 stars 29 forks source link

Cucumber expressions documentation #125

Closed JornWildt closed 3 years ago

JornWildt commented 3 years ago

Documenting cucumber expressions (including support for single quote strings).

ttutisani commented 3 years ago

I don't know why, but in this PR, I see a lot of things besides the documentation (see above, files changed - 10). Maybe because you reused the branch that you previously had. Please keep in mind that I squash-merged the cucumber expressions branch previously. So because now the commits are different between the branches, the same old changes are again showing up. To fix this, one way would be to create the branch out of the ttutisani:master and then only apply md file changes to that branch. Don't create a branch out of your own branches, because the commits differ.

ttutisani commented 3 years ago

Also see below: image

JornWildt commented 3 years ago

Hmm, not sure what the problem comes from, my Git-Fu is not especially good. Will take a look at it.

JornWildt commented 3 years ago

Could it be that you need to merge the two other PR's first, as they are submitted before this PR?

JornWildt commented 3 years ago

Okay, tried to "fetch upstream" in GitHub. Then pull to local dev-machine. Then merge into this branch (and the other two branches) and then push that.

Does it work now?

ttutisani commented 3 years ago

Yes, that worked. I just merged one of the PRs, so can you please repeat those steps for this branch?

JornWildt commented 3 years ago

can you please repeat those steps for this branch?

I believe I have done that for all three branches.

ttutisani commented 3 years ago

Yes, you did. I merged the single quotes PR after you did that. So the branch became out of date again.

ttutisani commented 3 years ago

Actually, I guess I could do it myself too. I just tried. Let's see if it helps.

ttutisani commented 3 years ago

I love how easy it is to change things in the PR 😄

ttutisani commented 3 years ago

I fixed a couple of things in the md file. Please let me know if you have any concerns. If not, I will merge.

JornWildt commented 3 years ago

No concerns from here. Looks great.