use fetch and base branch origin/master with promiscuous
use fetch and base branch origin/master with promiscuous

ibizaman/conffiles,ibizaman/conffiles,ibizaman/conffiles,ibizaman/conffiles,ibizaman/conffiles,ibizaman/conffiles