On Sun, Jan 03, 2016 at 09:08:26AM +0100, Dan Horák wrote: > On Sat, 2 Jan 2016 16:35:21 -0700 > Brad Bell <bradbell@xxxxxxxxxx> wrote: > > > Recently, epel7 was added to the pkgdb > > https://admin.fedoraproject.org/pkgdb/package/rpms/cppad/ > > Would someone please explain the following: > > 1. Why is one branch called el6 and the next epel7 instead of > > el7 ? > > because epel7 better fits the EPEL project, I suppose > > > 2. Why is there a .csvignore file in the initial epel7 branch ? > > because the epel7 branch was branched off the very first commit (F-7, > F-8 times) in the repo > > > 3. Should I just copy or git merge files from the master branch > > to epel7 ? > > yes, you can do a merge with master or some other branch or do whatever > you need As Dan said, the branch is created from the first commit ever in the repo, this makes it straight forward to merge into epel7 any branch you like (el6, f20, f21, f22, f23, master...) without any chance of conflict. Pierre -- packaging mailing list packaging@xxxxxxxxxxxxxxxxxxxxxxx http://lists.fedoraproject.org/admin/lists/packaging@xxxxxxxxxxxxxxxxxxxxxxx
