[Fedora-packaging] Should release number (DistTag) agree between branches ?

[Brad Bell]

I have the case where the master (rawhide) has the following verison and
release
     Version: 20150000.4
     Release: 2%{?dist}
The other branches have not had any builds with this version of the
upstream source.

It it correct to just merge the master into origin/f21 and then push as
     http://fedoraproject.org/wiki/Package_maintenance_guide
might be suggesting ?

Perhaps I should change the release to
     Release: 1%{?dist}
and the log  from
     * Sun Feb 01 2015 Brad Bell <bradbell at seanet dot com> - 20150000.4-2
to
     * Sun Feb 01 2015 Brad Bell <bradbell at seanet dot com> - 20150000.4-1