resolve: "tag" should override "branch"

Since it's used as a temporary thing.