fix: resolve ecs/task-definition.json merge conflict with main - #72
Merged
jhosepmyr merged 6 commits intoJul 10, 2026
Merged
Conversation
Release: merge develop into main
Now that api.tamci.app and app.tamci.app have real ACM certs wired into the ALB and CloudFront (reqsai-infra), the task definition should reference those instead of the raw ELB/CloudFront default hostnames.
hotfix: point production URLs at tamci.app custom domain
Gmail requires the From header to match the authenticated account when no alias is configured. Reads the same secret key as MAIL_USERNAME instead of hardcoding an address, so rotating SMTP credentials never needs a code change.
hotfix: set MAIL_FROM from the SMTP secret instead of the reqsai.com default
…efinition-merge-conflict # Conflicts: # ecs/task-definition.json
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
1 participant
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.
Description
The
develop→mainrelease PR (#71) reported a conflict inecs/task-definition.json. Both sides added content at the same insertion point (mainviahotfix/sync-*-develop's companion commits,developvia #65/#68's Jira/Stripe wiring), so git's 3-way merge couldn't auto-resolve even thoughdevelop's version is a strict superset ofmain's (every env var/secret onmainis already present ondevelop, plus the newer Jira/Stripe entries). Resolved by takingdevelop's file as-is — mergingorigin/maininto this branch confirms the diff againstmainis purely additive (48 insertions, 0 deletions).Bounded context / area: shared (deploy config only)
Related issue / US: Unblocks #71
Type of Change
feat— new featurefix— bug fixrefactor— code change without behavior changetest— tests onlydocs— documentation onlybuild/ci— build, dependencies, or CI/CDchore— maintenanceChecklist
develop(notmain)feature/*,bugfix/*, orhotfix/*./gradlew buildpasses locally (compile + tests +verifyModularity) — N/A, JSON-only merge-conflict resolution, no Java touched.pemkeys are committedCHANGELOG.mdupdated under[Unreleased]— N/A, no product change, pure conflict resolutionHow to Test
git diff origin/main -- ecs/task-definition.jsonon this branch shows only additions, no removed/changed keys — confirms nothing frommainwas dropped.Notes / Screenshots (optional)
After merging this into
develop, PR #71 (develop → main) should show no more conflicts onecs/task-definition.json.