I often have a workflow where I develop some feature in a Git branch, switch to another feature-branch, etc. During development, the original develop branch and the feature branches diverge.
Now when switching branches I am all of the sudden developing on an older version of my project (which is to be expected, of course).
I do wonder however whether something like a "tracking" behaviour can be configured with Git, which would mean that specially-marked feature branches would be automatically rebased on another branch (like
master). This would simplify a lot, especially rebuilds.