feat: merge Genesis IRP v1.3.1 onto master — resolve all merge conflicts - #8
Merged
AcingTime420 merged 10 commits intoAug 11, 2026
Conversation
…nflicts) Resolves all merge conflicts between feature/genesis-irp-v1.3.1-import-clean and master (post PR #5 repository integrity baseline). Conflict resolutions: - .github/workflows/ci.yml: combined master integrity checks + feature branch .NET/Node.js/Docker pipeline jobs into a single unified workflow - .gitignore: merged both ignore rule sets, keeping master's structured layout and adding Android/Gradle patterns from the feature branch - README.md: kept master's Acing IU Genesis documentation (discarded AI Studio boilerplate inadvertently included in the feature branch) - scripts/validate-premerge.sh: kept master's comprehensive validation script - scripts/validate-premerge.ps1: kept master's PowerShell validation wrapper Co-authored-by: AcingTime420 <271400013+AcingTime420@users.noreply.github.com>
Co-authored-by: AcingTime420 <271400013+AcingTime420@users.noreply.github.com>
Copilot
AI
changed the title
[WIP] Resolve merge conflicts in PR #4 and prepare for merge
feat: merge Genesis IRP v1.3.1 onto master — resolve all merge conflicts
Aug 8, 2026
AcingTime420
marked this pull request as ready for review
August 11, 2026 17:45
This was referenced Aug 11, 2026
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.
PR #4 (
feature/genesis-irp-v1.3.1-import-clean) was in a dirty/non-rebaseable state after PR #5 (Repository Integrity baseline) merged new files onto master that conflicted with the feature branch import.Conflict resolutions
.github/workflows/ci.yml— unified both versions: preserved master's repo-integrity + validate-baseline jobs; added feature branch's.NETbackend,Node.jsfrontend, and Docker containerization jobs as additional pipeline stages (all gated behindrepo-integrity).gitignore— merged both rule sets; kept master's structured layout and appended Android/Gradle-specific patterns (.gradle,.kotlin,/captures,.externalNativeBuild,.cxx,debug.keystore,.gemini/,gha-creds-*.json) from the feature branchREADME.md— kept master's Acing IU Genesis documentation; discarded AI Studio boilerplate that was inadvertently included in the feature branchscripts/validate-premerge.sh/scripts/validate-premerge.ps1— kept master's comprehensive validation scripts verbatimSecurity fix
Replaced hardcoded
POSTGRES_PASSWORD: SecureAcingPassword2026!and inline connection string credential inacing-iu/infrastructure/docker-compose.ymlwith${POSTGRES_PASSWORD}env var references (sourced from.env, excluded via.gitignore).Validation
bash scripts/validate-premerge.sh --skip-composeexits 0:guardian.jaremitted)Type
Validation
dotnet build/dotnet testlocally or CI greenRisk
Checklist