Comment by DEinspanjer

So in this model, what is the right way to merge mainline into your branch? Is it "git pull upstream mainline" while in your branch or something else?