Work Branches

[Ben Cooksley]

On Fri, Oct 18, 2019 at 8:51 AM Johan Ouwerkerk <jm.ouwerkerk at gmail.com> wrote:
>
> Just one question here: what is the impact on projects in the KDE/
> namespace which have only a single maintainer/contributor?
>
> Are we then essentially going to accept that users merge in their own
> MRs? And also, how then does that tie in with the expressed preference
> for fast-forward only merges on kde-devel? I.e. are we going to switch
> to fast-forward before or after doing the protcected branches thing?

Please note that no proposal to date has proposed restricting
developers from being able to push directly.
That will be continuing.

I therefore expect projects that have one or two contributors to be
minimally impacted by these various proposals.

The "protection" you may have seen discussed was referring to inbuilt
capabilities of Gitlab to ensure branches cannot be force pushed or
deleted.

>
> Regards,
>
> - Johan

Cheers,
Ben

>
> On Sat, Oct 5, 2019 at 4:11 AM Ben Cooksley <bcooksley at kde.org> wrote:
> >
> > Hi all,
> >
> > Recently we had a discussion (which I think may have ended up spread
> > over a couple of mailing lists in the end) concerning branches and the
> > ability to force push to them.
> >
> > Current policy forbids force pushing to branches except in very
> > limited circumstances (essentially where it is the only option to fix
> > a branch)
> >
> > The discussion ended with two ways forward, but no 100% clear
> > consensus on which way we want to go forward. The two proposed ways
> > were:
> > 1) Only protect 'master' and declared 'stable' branches.
> > 2) Protect all branches, aside from a given prefix (proposed to be work/)
> >
> > I'd like to clean this up and sort out the policy we want to have
> > surrounding this so we can move forward.
> >
> > From my perspective i'd rather we go with Option 2, as this will be
> > the approach that will be easier to both implement and maintain in the
> > long term and be the least likely to cause collaboration problems (as
> > the branch naming conventions will be universal across all our
> > repositories).
> >
> > Thoughts?
> >
> > Thanks,
> > Ben Cooksley
> > KDE Sysadmin