Git Protocol

Little thing, but I would say, "Rebase over your target branch frequently to incorporate upstream changes."