RobLoach / component-installer

Install Web Components through Composer
https://asset-packagist.org/
Other
280 stars 35 forks source link

The merger does not conflict changes from other forks. #79

Closed Moro4125 closed 9 years ago

glensc commented 9 years ago

you should rebase with upstream master and push -f

you seem to have lots of other commits in same branch that you created PR with (Moro4125:master)

glensc commented 9 years ago

i believe the commands you need to do are:

git checkout master
git fetch git@github.com:RobLoach/component-installer.git
git rebase -i FETCH_HEAD
git push -f

and AFTER this PR has been merged, you should reset your master to be equal to upstream master:

git checkout master
git fetch git@github.com:RobLoach/component-installer.git
git reset --hard FETCH_HEAD

and next time if you create PR, always create feature branch, do not commit to master!

Moro4125 commented 9 years ago

Thank you. I create new branch "feature-changes-from-forks". And I try to create PR again

glensc commented 9 years ago

this was exacly why i wrote here that you would not create new pr

and you didn't even reference your new pr!

here's the reference now: #80