firefrost-gaming/antigravity-skills-reference
3
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

docs: always merge PRs via GitHub for contributor credit, add merging guide

Browse Source 
- Add docs/maintainers/merging-prs.md: policy to always use Squash and merge,
  resolve conflicts on PR branch so PR shows Merged; Co-authored-by for rare
  local integration
- Update .github/MAINTENANCE.md: merge via GitHub only, never close after
  local integration; conflict resolution on branch then merge
- Update CONTRIBUTING.md Recognition: we always merge accepted PRs on GitHub,
  never close after integrating locally

Addresses feedback from @sraphaz on #225 (attribution when PRs are integrated
locally). Going forward PRs will show as Merged so contributors get full credit.
This commit is contained in:
sck_0
2026-03-07 11:35:31 +01:00
parent 8fc429904b
commit b1eefcfdf4
3 changed files with 78 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.github/MAINTENANCE.md vendored
View File

@@ -91,6 +91,12 @@ Before ANY commit that adds/modifies skills, run the chain:
3. **Quality Bar** — PR description confirms the [Quality Bar Checklist](.github/PULL_REQUEST_TEMPLATE.md) (metadata, risk label, credits if applicable).
4. **Issue link** — If the PR fixes an issue, the PR description should contain `Closes #N` or `Fixes #N` so GitHub auto-closes the issue on merge.
**How you merge:**
- **Always merge via GitHub** so the PR shows as **Merged** and the contributor gets credit. Use **"Squash and merge"**. Do **not** integrate locally and then close the PR — that would show "Closed" and the contributor would not get proper attribution.
- **If the PR has merge conflicts:** Resolve them **on the PR branch** (you or the contributor: merge `main` into the PR branch, fix conflicts, run `npm run chain` and `npm run catalog` if needed, push). Then use **"Squash and merge"** on GitHub. Full steps: [docs/maintainers/merging-prs.md](../docs/maintainers/merging-prs.md).
- **Rare exception:** Only if merging via GitHub is not possible, you may integrate locally and close the PR; in that case you **must** add a Co-authored-by line to the commit and explain in a comment. Prefer to avoid this so PRs are always **Merged**.
**Right after merging:**
1. **If the PR had `Closes #N`** — The issue is closed automatically; no extra action.