Skip to content

Commit 960bec3

Browse files
committed
fix references
1 parent 4113da1 commit 960bec3

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

CONTRIBUTING.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
This project follows a **Git Flow** branching strategy:
66

77
```
8-
main (production)
8+
master (production)
99
1010
├── dev (development/staging)
1111
│ │
@@ -20,11 +20,11 @@ main (production)
2020

2121
| Branch | Purpose | Base | Merges To |
2222
|--------|---------|------|-----------|
23-
| `main` | Production-ready code | - | - |
24-
| `dev` | Development/staging | `main` | `main` |
23+
| `master` | Production-ready code | - | - |
24+
| `dev` | Development/staging | `master` | `master` |
2525
| `feature/*` | New features | `dev` | `dev` |
2626
| `bugfix/*` | Bug fixes | `dev` | `dev` |
27-
| `hotfix/*` | Critical production fixes | `main` | `main` & `dev` |
27+
| `hotfix/*` | Critical production fixes | `master` | `master` & `dev` |
2828

2929
### Workflow
3030

@@ -49,7 +49,7 @@ main (production)
4949

5050
4. **After PR approval:**
5151
- Merge to `dev` for testing
52-
- After testing, create PR from `dev` to `main`
52+
- After testing, create PR from `dev` to `master`
5353

5454
### Commit Message Convention
5555

docs/GAP_ANALYSIS.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ common_tags = {
146146

147147
**Branch Strategy:**
148148
```
149-
main (production)
149+
master (production)
150150
151151
└── dev (development)
152152
@@ -190,7 +190,7 @@ resource "aws_cloudwatch_log_group" "lambda_logs" {
190190
| Workflow | Trigger | Purpose |
191191
|----------|---------|---------|
192192
| `terraform-validate.yml` | Push/PR | Validate Terraform & lint Python |
193-
| `pr-check.yml` | PR to main | Check branch naming, secrets |
193+
| `pr-check.yml` | PR to master | Check branch naming, secrets |
194194
| `deploy.yml` | Manual | Deploy to AWS |
195195

196196
---

0 commit comments

Comments
 (0)