Skip to content
This repository has been archived by the owner on Jan 29, 2020. It is now read-only.

[Doc]In Composer Serve Command " was missing #286

Closed
wants to merge 1 commit into from

Conversation

zf2timo
Copy link
Contributor

@zf2timo zf2timo commented Jan 25, 2016

No description provided.

@zf2timo zf2timo changed the title In Composer Serve Command " was missing [Doc]In Composer Serve Command " was missing Jan 25, 2016
@samsonasik
Copy link
Contributor

@zf2timo the doc moved to another folder, please rebase

@zf2timo
Copy link
Contributor Author

zf2timo commented Jan 27, 2016

@samsonasik How can i do a rebase to a changed file path?

@samsonasik
Copy link
Contributor

Should do-able with this steps:

git checkout master
git remote add upstream git://github.com/zendframework/zend-expressive.git
git pull upstream master
git checkout composer-serve-fix
git rebase master

you will get conflict, now, you can remove doc/book/quick-start.md completely, and then, modify moved quick-start, now, next steps are:

git add .
git rebase --continue
git push --force origin composer-serve-fix

@zf2timo
Copy link
Contributor Author

zf2timo commented Jan 27, 2016

@samsonasik Thank you for the instructions.

But after the git rebase master i don't receive a conflict and also there are no changes in my repository.

@samsonasik
Copy link
Contributor

if master changed, the changes should applied to composer-serve-fix when do rebase master, if everything ok, should do able just do:

git push --force origin composer-serve-fix

if still not work, probably just do new pull request.

@zf2timo
Copy link
Contributor Author

zf2timo commented Jan 27, 2016

@samsonasik i created a new PR in #289

@zf2timo zf2timo closed this Jan 27, 2016
weierophinney added a commit that referenced this pull request Jan 27, 2016
[Doc]In Composer Serve Command " was missing
weierophinney added a commit that referenced this pull request Jan 27, 2016
weierophinney added a commit that referenced this pull request Jan 27, 2016
weierophinney added a commit that referenced this pull request Jan 27, 2016
@weierophinney weierophinney added this to the 1.0.0 milestone Jan 27, 2016
@weierophinney weierophinney self-assigned this Jan 27, 2016
@zf2timo zf2timo deleted the composer-serve-fix branch January 27, 2016 14:56
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants