sts-sponsors team mailing list archive

Thread
Date

Re: [Merge] ~petermakowski/maas-site-manager:update-timezone-MAASENG-1592 into maas-site-manager:main

To: mp+441671@xxxxxxxxxxxxxxxxxx
From: Peter Makowski <mp+441671@xxxxxxxxxxxxxxxxxx>
Date: Fri, 21 Apr 2023 10:48:41 -0000
In-reply-to: <168207387862.1593509.6974424081961237977.codereview@juju-98d295-prod-launchpad-2>
Reply-to: mp+441671@xxxxxxxxxxxxxxxxxx
Sender: noreply@xxxxxxxxxxxxx

> LGTM! Although I think there might be a merge conflict with this, just make
> sure you merge the latest version of main into your branch before we approve
> this

Technically launchpad should display if there are any conflicts? In any case, I just did a rebase and there were none.
-- 
https://code.launchpad.net/~petermakowski/maas-site-manager/+git/site-manager/+merge/441671
Your team MAAS Committers is requested to review the proposed merge of ~petermakowski/maas-site-manager:update-timezone-MAASENG-1592 into maas-site-manager:main.

References

Re: [Merge] ~petermakowski/maas-site-manager:update-timezone-MAASENG-1592 into maas-site-manager:main
From: Nick De Villiers, 2023-04-21