Closed LarryBattle closed 11 years ago
This issue was a challenge.
Goal: Copy master
over to gh-pages
I did something like this to avoid having a merge conflict.
git branch gh-pages
git pull -u
git add . -A
git commit -a -m "merged"
rm .
git checkout master .
git add . -A
git commit -a -m "merged"
git push
The goal is to first update the gh-pages
branch, commit, delete all the files and folders, then copy of the files and folders from the master
branch and commit.
Note: Next time try git cherry-pick master
.
Version 0.3.11 is out of sync. The branch gh-pages
has version 0.3.11
while master
has version 0.3.10
.
Try these.
git checkout master
git fetch gh-pages
git reset --hard origin/master
or
git checkout master
git checkout gh-pages -- *
This works for me.
git checkout master
git rm -f *
git checkout gh-pages -- *
git add . -A
git commit -m "..."
Synced.
For some odd reason the documentation posted at larrybattle.github.com/Ratio.js/doc/classes/Ratio.html contains the old data for version 0.3.6.
I think this had something to do with the github windows applications I used.