FWIW, the merge-pr script here https://ibm.box.com/s/mxzc1w7ywcxb7lukwcn5jdkg883jc09i <https://ibm.box.com/s/mxzc1w7ywcxb7lukwcn5jdkg883jc09i> will do everything up to the ./build.sh for you. e.g., $ merge-pr -C ~/git/clone-incubator-quarks-website 27
> > In order, the commands you run should look like similar to this: > > git checkout master # switch to > master > git pull origin master # update master > git pull origin asf-site # update > asf-site > git fetch mirror pull/<XX>/head:pr-XX # fetch the changes from > the pull request > git merge pr-XX # update > master with the PR's changes > git push origin master # push updated > master to apache git repo > ./build.sh # > Generate the html files, switch to asf-site, and update it > git push origin asf-site # push updated > asf-site to apache git repo >
