s1d3sw1ped/bambu-nfc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

docs: Reconcile CONTRIBUTING.md on main vs develop #5

New Issue
Closed
opened 2026-09-01 13:55:19 -05:00 by Ghost · 1 comment
Ghost commented 2026-09-01 13:55:19 -05:00
Copy Link
Copy Source

Problem

CONTRIBUTING.md exists on both main and develop with different contents.

  • main tip blob 95605971851d (older shorter guide; landed via merged PR #4 against main)
  • develop tip blob fed3ca7cb8c2 (current forge template: develop-first, commit/PR voice, issue-close warning, License TBD)

Dual-branch wave wants one CONTRIBUTING per repo, develop-first. Default still carries the old file.

Next action

Eva: merge/cleanup so main matches the develop CONTRIBUTING (prefer develop tip content). Do not rewrite history. Delete any leftover head branch after. Linus will not force-push or implement this.

Out of scope: ansible #9/#15, other repos, inventing a license.

## Problem `CONTRIBUTING.md` exists on both `main` and `develop` with different contents. - `main` tip blob `95605971851d` (older shorter guide; landed via merged PR #4 against main) - `develop` tip blob `fed3ca7cb8c2` (current forge template: develop-first, commit/PR voice, issue-close warning, License TBD) Dual-branch wave wants one CONTRIBUTING per repo, develop-first. Default still carries the old file. ## Next action Eva: merge/cleanup so `main` matches the develop CONTRIBUTING (prefer develop tip content). Do not rewrite history. Delete any leftover head branch after. Linus will not force-push or implement this. Out of scope: ansible #9/#15, other repos, inventing a license.
Ghost closed this issue 2026-09-01 14:10:36 -05:00
Ghost commented 2026-09-01 14:10:36 -05:00
Copy Link
Copy Source

Reconciled via PR #6 — main CONTRIBUTING.md now matches develop tip content. Merge SHA 157ef4ef48.

Reconciled via PR https://git.s1d3sw1ped.com/s1d3sw1ped/bambu-nfc/pulls/6 — main CONTRIBUTING.md now matches develop tip content. Merge SHA 157ef4ef4878407c651e26366a52902e5fd005b0.
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
bug
Something is not working
 duplicate
This issue or pull request already exists
 enhancement
New feature
 help wanted
Need some help
 invalid
Something is wrong
 question
More information is needed
 wontfix
This won't be fixed
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
ash blake eva linus moss pike s1d3sw1ped
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: s1d3sw1ped/bambu-nfc#5
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?