fix: updated the branch to resolve the conflict - #1104
Merged
Roopan-Microsoft merged 1 commit intoJul 19, 2026
Merged
Conversation
Roopan-Microsoft
approved these changes
Jul 19, 2026
Roopan-Microsoft
merged commit Jul 19, 2026
0ac4907
into
microsoft:conflicts-resolve
3 checks passed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Purpose
This pull request removes the PowerShell (
Build-And-Push-Images.ps1) and Bash (build_and_push_images.sh) scripts for building and pushing container images, as well as updating the related documentation to clean up duplicate or deprecated scripts. Additionally, it marks several agent team configurations as default in their respective JSON files.Script and Documentation Cleanup
infra/scripts/Build-And-Push-Images.ps1, which previously handled building, pushing, and updating container images for backend, frontend, and MCP services in Azure.infra/scripts/build_and_push_images.sh, the Bash equivalent of the PowerShell script, which performed the same tasks for environments using Bash.docs/ACRBuildAndPushGuide.mdto remove duplicatedocker buildcommands, simplifying the instructions for building and pushing images. [1] [2]Agent Team Configuration Updates
content_gen.json), HR onboarding team (hr.json), and RFP analysis team (rfp_analysis_team.json) as default by adding"is_default": trueto each configuration. [1] [2] [3]These changes streamline the image build/push process by removing redundant scripts and clarify which agent teams should be considered defaults in the application.
Does this introduce a breaking change?
How to Test
What to Check
Verify that the following are valid
Other Information