Skip to content

Adding some typehint #84

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

Closed
wants to merge 1 commit into from

Conversation

ThomasLandauer
Copy link
Member

A (more or less) useful by-product while trying the workflow of https://github.com/TavoNiievez/module-symfony/pull/1

@TavoNiievez
Copy link
Member

Hmm..

This was already fixed in #41, apparently the master branch of your fork is out of date 75 commits behind the master branch of this project.

Keep in mind that changes should always be made based on the master of this project.

The solution in these cases is that always, before making a change, run:

# This step once:
git remote add upstream https://github.com/Codeception/module-symfony.git

# These always:
git pull upstream master
git rebase upstream/master

So that you synchronize the master branch of your fork with the master of this project.

Maybe this should be added to the contribution guides?

I'm closing this as the change in question is already included.

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