Eliminating some of the pain of long-lived feature branches

yea but long lived branches are still necessary