Upstream (from the git mirror) has branches called 2.7, 3.4, master, etc. This is a fork, so has to pull new commits from the git mirror every so often (we should write a cron script to automate this). We shouldn't commit to those branches so they stay pristine from upstream, and all pulls are fast-forwards.
Make new branch for each rebase? Maybe called 2.7_rebase141028, master_rebase141028, etc? Also named topic branches for work on each PR to bring patches in. JuliaLang informally has topic branches start with person's initials, easier to group them together that way.
Upstream (from the git mirror) has branches called 2.7, 3.4, master, etc. This is a fork, so has to pull new commits from the git mirror every so often (we should write a cron script to automate this). We shouldn't commit to those branches so they stay pristine from upstream, and all pulls are fast-forwards.
Make new branch for each rebase? Maybe called 2.7_rebase141028, master_rebase141028, etc? Also named topic branches for work on each PR to bring patches in. JuliaLang informally has topic branches start with person's initials, easier to group them together that way.