Yes, I'm leaning towards MANIFEST.SKIP.

Having a separate branch has caused me grief in my current workplace when other people kept merging into master and I kept resolving conflicts. I ended up committing unfinished code with die "unimplemented"; # TODO cover with tests & release stubs all over it. But maybe that's just me.