inbuxa/inbuxa-admin
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 22 Wiki Activity Sponsor

Say upstream is no longer merged #113

Merged
jcoffey-dev merged 1 commits from docs/no-upstream-merges into main 2026-10-18 22:22:10 +00:00
Conversation 0 Commits 1 Files Changed 2
+11 -13
jcoffey-dev commented 2026-10-18 22:20:08 +00:00
Owner
Copy link
Copy source

The README's "Keeping up with upstream" section described an ordinary
fork that merges each upstream release (git merge v1.0.12), and
CONTRIBUTING asked for small changes to upstream files so the next
import would merge cleanly. Neither holds any more: upstream's v2.0.0
put code under a proprietary license, and the console no longer takes
upstream changes.

  • README: the section is now "Upstream". The console was forked at
    v1.0.11, nothing later is merged or copied in, and features worth
    having are written here. The Versions note no longer promises clean
    merges.
  • CONTRIBUTING: the same rule for contributors, and "licence" is now
    "license".

Docs only. No new strings.

The README's "Keeping up with upstream" section described an ordinary fork that merges each upstream release (`git merge v1.0.12`), and CONTRIBUTING asked for small changes to upstream files so the next import would merge cleanly. Neither holds any more: upstream's v2.0.0 put code under a proprietary license, and the console no longer takes upstream changes. - README: the section is now "Upstream". The console was forked at v1.0.11, nothing later is merged or copied in, and features worth having are written here. The Versions note no longer promises clean merges. - CONTRIBUTING: the same rule for contributors, and "licence" is now "license". Docs only. No new strings.
jcoffey-dev added 1 commit 2026-10-18 22:20:08 +00:00
Say upstream is no longer merged
ci / build (pull_request) Skipped
Details
ci / publish (pull_request) Skipped
Details
ci / notices (pull_request) Successful in 13s
Details
github/ci (branch) GitHub Actions
Details
ci / github (pull_request) Successful in 1m43s
Details
ca1689c87c 
The README still described an ordinary fork that merges each upstream
release, and CONTRIBUTING kept changes small so the next import would
merge cleanly. Neither holds since upstream v2.0.0 put code under a
proprietary license and we stopped taking upstream changes: nothing after
v1.0.11 comes in, and features are written here.
jcoffey-dev merged commit 9d916ddca6 into main 2026-10-18 22:22:10 +00:00
jcoffey-dev deleted branch docs/no-upstream-merges 2026-10-18 22:22:10 +00:00
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
Clear labels
bug
Something isn't working
 dependencies
Dependency updates
 documentation
Docs, README or site copy
 duplicate
Already tracked elsewhere
 enhancement
New feature or improvement
 good first issue
Good for newcomers
 help wanted
Contributions welcome
 invalid
Not a valid issue
 needs info
Waiting on the reporter for details
 question
Needs an answer, not a code change
 security
Security issue or hardening
 translation
New language or translation fixes
 wontfix
Will not be worked on
priority
p1
High priority
priority
p2
Medium priority
priority
p3
Low priority
No labels
Milestone
No items
No Milestone
Projects
Clear projects
No projects
Assignees
Clear assignees
jcoffey-dev (John Coffey)
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: inbuxa/inbuxa-admin#113