Re: [akmods: 3/3] Merge branch 'el7'
On Qua, 2016-11-23 at 14:09 +0100, Nicolas Chauvet wrote:
2016-11-23 13:46 GMT+01:00 Dominik 'Rathann' Mierzejewski
<dominik(a)greysector.net>:
>
> On Wednesday, 23 November 2016 at 13:40, Nicolas Chauvet wrote:
> >
> > 2016-11-23 0:38 GMT+01:00 Sérgio M. Basto <sergiomb(a)rpmfusion.org
> > >:
> > >
> > > commit 580f919341f903be8383f4159a5b47b3d0c78dd2
> > > Merge: 3673a38 2d1568a
> > > Author: Sérgio M. Basto <sergio(a)serjux.com>
> > > Date: Tue Nov 22 23:35:20 2016 +0000
> > >
> > > Merge branch 'el7'
> > HOW IS THAT even possible that you merge back and forth el7
> > branch to devel.
> > STOP doing that this is totally insane!
> Only fast-forward merges should be done from non-master branches to
> master. Otherwise we're getting junk "merge commits" unnecessarily.
Well, I would even say don't even merge anything "TO" master. Master
is the main branch for development, so there are no reason that any
commit isn't there first if relevant.
If you have diverged from master, you cannot merge anymore, only
cherry-pick the commit or range you wan't back to your particular
branch.
We still have some packages , that we cannot merge anymore and can be
fixed by merging branch into master as explain by others in this
thread.
what is the state of this thread ?, like also was point out rebase
needs a git push --force .
Also this is a minor detail, I don't want spend much energy on this
subject, but I'd like know if I'm authorized (again) or not to fix git
repos to have fast-forward (merge) again ?
Thanks,
--
Sérgio M. B.