← Back to team overview

canonical-ubuntu-qa team mailing list archive

Re: [Merge] ~andersson123/auto-upgrade-testing-specifications:add_lunar_mantic_profiles into auto-upgrade-testing-specifications:main

 

Review: Needs Fixing

There is an extra commit in the branch you are proposing:

69dc371 Add lunar->mantic profiles

Rebase your changes on main:

git switch main
git pull
git switch add_lunar_mantic_profiles
git rebase main

I *think* you should end up with a merge conflict. Solve that, or (better) do an interactive rebase instead:

git rebase -i main

and drop the extra commit.
-- 
https://code.launchpad.net/~andersson123/auto-upgrade-testing-specifications/+git/auto-upgrade-testing-specifications/+merge/443984
Your team Canonical Platform QA Team is subscribed to branch auto-upgrade-testing-specifications:main.



References