From 7332b4dd8b5763fea2b0e178b56af1d4a567278e Mon Sep 17 00:00:00 2001 From: Blai Peidro Date: Tue, 18 Aug 2026 22:40:16 +0200 Subject: [PATCH] docs: drop the upstream remote, which nothing can merge from --- CLAUDE.md | 2 +- docs/github.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CLAUDE.md b/CLAUDE.md index 5ed2d03fa..fbff4ba6c 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -25,7 +25,7 @@ gh pr merge --repo OpusProjects/sysPass --squash --delete-branch # we self ``` - **Types** (branch prefix and commit/PR title alike): `feat`, `fix`, `perf`, `refactor`, `docs`, `test`, `build`, `chore` — as in every OpusProjects repo. -- **Remotes:** `origin` = our fork `OpusProjects/sysPass` (push here) · `upstream` = `nuxsmin/sysPass` (read-only). Default branch: `main`. +- **Remote:** `origin` = `OpusProjects/sysPass`, the only one — the discontinued `nuxsmin/sysPass` shares no history with our squashed `main`, so nothing merges or rebases from it. Default branch: `main`. - **Git identity** is set repo-locally (`blaipr` / `blaipr@hotmail.com`) — plain `git commit` works. - `gh pr edit` can silently no-op on this repo (classic-Projects GraphQL field); if a body edit doesn't apply, PATCH via `gh api -X PATCH repos/OpusProjects/sysPass/pulls/ -F body=@file`. diff --git a/docs/github.md b/docs/github.md index fb7603d3d..6c7a30aa0 100644 --- a/docs/github.md +++ b/docs/github.md @@ -185,7 +185,7 @@ gh pr merge --repo OpusProjects/sysPass --squash --delete-branch ``` Branch names are `/` and titles are `: short imperative summary`, drawn from -`feat`, `fix`, `perf`, `refactor`, `docs`, `test`, `build` and `chore`. The remotes are `origin` for -this fork, which is where everything is pushed, and `upstream` for the read-only `nuxsmin/sysPass`. +`feat`, `fix`, `perf`, `refactor`, `docs`, `test`, `build` and `chore`. The only remote is `origin`, +this repository — the discontinued `nuxsmin/sysPass` shares no history with the squashed `main`. [CONTRIBUTING.md](../CONTRIBUTING.md) covers development setup and coding conventions in full.