I’ve made a few small changes to julia/test/perf/micro to get them running on 0.7.0. I’d like to make a pull request for them, but I can’t figure out the proper git workflow from the docs.
So far I’ve followed directions from CONTRIBUTING.md
- have forked github.com/julia to github.com/johnfgibson/julia
- have cloned the fork to a local machine
- switched local clone to branch
- made changes, got the benchmarks running
- did a git add, git commit, and
git push origin perf-micro-updateto push the changes to my github fork
But now my github fork is 92 commits behind master, and I can’t figure out how to merge those into my work, local or github, in order to make a clean pull request.
The Patrick O’Leary Julia-Github video and accompanying notes give a beautiful explanation what to do, but directly between a local clone and github.com/julia, without the intervening fork of julia to one’s personal github account. But that fork is recommended by CONTRIBUTING.md. I don’t get the reason for the fork or how to adapt the O’Leary instructions to deal with it.