GitLab

[Andrew Bartlett]

On Mon, 2018-12-03 at 13:58 +0100, swen via samba-technical wrote:
> ..to the GitLab experts.
> 
> I'm a bit unsure on how code contributions to samba 
> are supposed to be "processed" now.
> 
> So first a more general question.
> The way I understood, it is preferred to have contributions
> go to Gitlab INSTEAD of sending them to the mailing list.
> Is that correct ?
> 
> Once they passed the tests on Gitlab, I create a merge-request.
> But I just saw now, that this can be done in at least 2 places.
> 
> The Samba Team -> samba -> merge requests
> and
> The Samba Team -> Upstream Samba Development -> samba -> merge requests
> What is the difference and does it matter which one is picked ?

Merge requests should be made 'to' https://gitlab.com/samba-team/samba

This is (the mirror of) our master repo.  The official branches are
kept up to date in https://gitlab.com/samba-team/devel/samba/ (mostly
to avoid confusion), but it should not be the target.

I hope this clarifies things,

Andrew Bartlett
-- 
Andrew Bartlett                       http://samba.org/~abartlet/
Authentication Developer, Samba Team  http://samba.org
Samba Developer, Catalyst IT          http://catalyst.net.nz/services/samba