Start a feature branch that will cleanly merge to other branches