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

Gen documentation cleanup #1411

Merged
merged 24 commits into from Sep 14, 2013

Conversation

Projects
None yet
4 participants
@wikimatze
Member

wikimatze commented Sep 14, 2013

This time I rebased against master and resolved conflicts ans just add the resolved files with git add and was wondering why no additional commits occured. I used git push with the --force option to push the resolved conflicts. If there are no conflicts, I think I will then have finally understood pull requests.

Cheers from Berlin

Matthias

@ujifgc

This comment has been minimized.

Show comment
Hide comment
@ujifgc

ujifgc Sep 14, 2013

Member

One more very important thing: you should run tests on feature branch before pushing PR.

Member

ujifgc commented Sep 14, 2013

One more very important thing: you should run tests on feature branch before pushing PR.

@ujifgc

This comment has been minimized.

Show comment
Hide comment
@ujifgc

ujifgc Sep 14, 2013

Member

BTW, did you use git pull --rebase padrino master?

Member

ujifgc commented Sep 14, 2013

BTW, did you use git pull --rebase padrino master?

@wikimatze

This comment has been minimized.

Show comment
Hide comment
@wikimatze

wikimatze Sep 14, 2013

Member

I run the tests .. but I think I was in master instead of my branch :(. I did not used the git pull --rebase padrino master command :(. More things to learn how collaboration with PRs really works.

Member

wikimatze commented Sep 14, 2013

I run the tests .. but I think I was in master instead of my branch :(. I did not used the git pull --rebase padrino master command :(. More things to learn how collaboration with PRs really works.

@namusyaka

This comment has been minimized.

Show comment
Hide comment
@namusyaka

namusyaka Sep 14, 2013

Member

Great! 👍
Thank you!

Member

namusyaka commented Sep 14, 2013

Great! 👍
Thank you!

namusyaka added a commit that referenced this pull request Sep 14, 2013

@namusyaka namusyaka merged commit bb6f22c into padrino:master Sep 14, 2013

1 check passed

default The Travis CI build passed
Details
@DAddYE

This comment has been minimized.

Show comment
Hide comment
@DAddYE

DAddYE Sep 14, 2013

Member

Thanks!!!!!

On Sep 14, 2013, at 10:43 AM, namusyaka notifications@github.com wrote:

Great!
Thank you!


Reply to this email directly or view it on GitHub.

Member

DAddYE commented Sep 14, 2013

Thanks!!!!!

On Sep 14, 2013, at 10:43 AM, namusyaka notifications@github.com wrote:

Great!
Thank you!


Reply to this email directly or view it on GitHub.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment