How do I fast-forward other tracking branches in git?

Question

We are working with the model of a single remote repository that all of us use. We branch for new features and reintegrate into a trunk branch. Our workflow is that we shoul

Answer 1

I think the easiest way to avoid the git checkout trunk, git pull, git checkout branch cycle is to use this answer:

git fetch upstream trunk:trunk

This does exactly what you want - fast-forward your local branch trunk to the remote branch's HEAD.