← Back to team overview

sts-sponsors team mailing list archive

Re: [Merge] ~thorsten-merten/maas-site-manager:MAASENG-1285-merge-frontend into maas-site-manager:main

 

@jonesogolo: I first moved the code in the UI reposotory to a `/frontend` folder and then merged the whole repo to here instead of copying/moving the code manually.

This way git could take care of doing everyting properly. 

Essentially something like:
git merge --allow-unrelated-histories frontend/main 
with frontend pointing to
git+ssh://...@git.launchpad.net/~maas-committers/maas-site-manager/+git/maas-site-manager-frontend
-- 
https://code.launchpad.net/~thorsten-merten/maas-site-manager/+git/maas-site-manager/+merge/437943
Your team MAAS Committers is subscribed to branch ~thorsten-merten/maas-site-manager:MAASENG-1285-merge-frontend.



References