Forward-merge sounds useful, but can't you just fetch from the remote and then merge the remote -- e.g. git merge origin/shared-branch ? Cascade, on the other

Forward-merge sounds useful, but can't you just fetch from the remote and then merge the remote -- e.g. git merge origin/shared-branch ? Cascade, on the other hand, sounds way too risky for me to want to use. The few seconds of time you're saving are an investment into not fucking up something huge. In general, I'm not a fan of anything that's designed specifically to make it easier for you to skirt a version control/deployment workflow you've established. That just puts unnecessary effort into treating the symptoms of a bad workflow (or an unrealistic stakeholder) when you should be working to address the root cause instead.