Skip to content

fix: updated the branch to resolve the conflict - #1104

Merged
Roopan-Microsoft merged 1 commit into
microsoft:conflicts-resolvefrom
Dhruvkumar-Microsoft:conflicts-resolve
Jul 19, 2026
Merged

fix: updated the branch to resolve the conflict#1104
Roopan-Microsoft merged 1 commit into
microsoft:conflicts-resolvefrom
Dhruvkumar-Microsoft:conflicts-resolve

Conversation

@Dhruvkumar-Microsoft

Copy link
Copy Markdown
Contributor

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

  • Removed infra/scripts/Build-And-Push-Images.ps1, which previously handled building, pushing, and updating container images for backend, frontend, and MCP services in Azure.
  • Removed infra/scripts/build_and_push_images.sh, the Bash equivalent of the PowerShell script, which performed the same tasks for environments using Bash.
  • Updated docs/ACRBuildAndPushGuide.md to remove duplicate docker build commands, simplifying the instructions for building and pushing images. [1] [2]

Agent Team Configuration Updates

  • Marked the content generation agent team (content_gen.json), HR onboarding team (hr.json), and RFP analysis team (rfp_analysis_team.json) as default by adding "is_default": true to 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?

  • Yes
  • No

How to Test

  • Get the code
git clone [repo-address]
cd [repo-name]
git checkout [branch-name]
npm install
  • Test the code

What to Check

Verify that the following are valid

  • ...

Other Information

@Roopan-Microsoft
Roopan-Microsoft merged commit 0ac4907 into microsoft:conflicts-resolve Jul 19, 2026
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants