Git workflow for vectorization branch

This assumes that your .git/config file contains some lines like:

[remote "origin"]
    fetch = +refs/heads/*:refs/remotes/origin/*
    url = git@github.com:yourusername/rust.git
[branch "master"]
    remote = origin
    merge = refs/heads/master
[remote "graydon"]
    url = git@github.com:graydon/rust.git
    fetch = +refs/heads/*:refs/remotes/graydon/*
[branch "vectorization"]
    remote = origin
    merge = refs/heads/vectorization

Bring your master branch up to date and rebase vectorization onto it:

git checkout master
git fetch graydon
git merge graydon/master
git rebase master vectorization

If there are conflicts, fix them, git add the file that was conflicted, and do git rebase --continue. You might have to do this several times.

Then, try to push to the remote vectorization branch:

git push origin vectorization

If you get the "failed to push some refs" error:

git checkout vectorization 
git fetch origin
git merge origin vectorization

git add any changed files and commit them. Then:

git push origin vectorization