Using gitlab question

[Jeremy Allison]

On Fri, Jun 21, 2019 at 06:36:01AM +1200, Andrew Bartlett wrote:
> On Thu, 2019-06-20 at 11:26 -0700, Jeremy Allison wrote:
> > On Fri, Jun 21, 2019 at 06:23:25AM +1200, Andrew Bartlett wrote:
> > > On Thu, 2019-06-20 at 10:29 -0700, Jeremy Allison via samba-technical
> > > wrote:
> > > > I have a pending merge request:
> > > > 
> > > > https://gitlab.com/samba-team/samba/merge_requests/558
> > > > 
> > > > that has been made unmergable by a commit from another
> > > > Team member that needs to go into autobuild before
> > > > my change (it's a minor change to test code lists
> > > > that needs rebasing).
> > > > 
> > > > What is the correct procedure for doing this ?
> > > > 
> > > > Do I close the existing merge request and re-issue
> > > > a new CI-run followed by merge request ?
> > > > 
> > > > Or is there a way to ammend my existing merge
> > > > request with an updated patchset once I've
> > > > fixed the rebase conflict ?
> > > 
> > > A good question (because it isn't in the wiki really)!
> > 
> > Any chance it can be added there ?
> 
> It is a wiki, there is a very good chance you can update it ;-)

Bit busy with other things at the moment, but will if I
have time / need a break :-).