Updating our LiveLabs for FY27 content and OAIW

[mesarmie]

11521

Our SLAs

Please review before contacting us

General requirements

1. Information in the workshop is adequate and updated
2. Code is correct and working
3. Links are correct
4. Make sure you enter the help email link in your manifest.json
5. Please make sure WMS URLs are updated as needed after your PR is approved

Checklist - Refer to the Self QA Checklist in WMS for the complete list

Please confirm that the following is completed before submitting your PR

• Complete the Self QA Checklist in WMS
• Your workshop folder structure should be similar to the one used in the sample workshop
• All filenames are lowercase and descriptive (including folders, images, files, etc.)
• Image references in markdown contain an alternate text.
• Ensure the PR does not contain binary or install files and files larger than 100 MB.

[mesarmie]

Hello, I opened the PR #609 - please let me know if there's anything else I have to do. I need this ready for an onsite dry run, next week on Tuesday. Thanks in advance!

[TeodorLav]

Hi @mesarmie,

You have some conflicts that need to be resolved first.

Thank you!

[mesarmie]

Hi @TeodorLav ! Thanks for helping me with this. I don't use Github often, I see the conflicts, but what do I have to do to solve them? The reslove conflicts button is grayed out. My previous pull requests were approved without me doing anything like this. Thanks so much for your help.

[TeodorLav]

Hi @mesarmie — no problem. A conflict simply means that your branch and the LiveLabs main branch changed the same part of one or more files, and Git cannot safely choose which version to keep.
Because there are several conflicts, GitHub’s web editor cannot resolve them. You will need to use a local Git tool, such as GitHub Desktop or VS Code:

1. Update your fork from oracle-livelabs/oci:main.
2. Open the files Git marks as conflicted.
3. Choose the correct content from your version and the current LiveLabs version.
4. Save the files, commit the resolution, and push to your fork.
   The existing pull request will update automatically after you push—there is no need to create another PR.

[mesarmie]

@TeodorLav - appreciate the directions. I spent a lot of time making the updates in Visual Studio and I definitely don't want to mess anything up. Could you get on a zoom call with me to show me these steps live? I'd like to record you so I know exactly what to do on my own next time this happens. Again, I just don't want to mess something up with the work I've already done. Thanks in advance.

[mesarmie]

@TeodorLav Please let me know, we have an event tomorrow and need to take care of this as soon as possible.

[mesarmie]

I've had Codex try to resolve those conflicts. Can I please get some assistance.