Test if cherry-pick would fail with conficts.
Include buildscripts when tagging