hernani/koopa-admin-log
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
koopa-admin-log/ops/local-branches-sync.md

987 B
Raw Blame History

Local-only copy — /home/hernani/koopa-admin-log

main → Forgejo origin (ok to push)

local/* → NEVER push to origin; sync only via home/bundle between kisten

Branches:

local/zusatz-docs ab06ffe (daylog Zusatzübersetzungen)

local/zusatz 3b67613 (scrubbed tip)

local/secret-ui-scrub 3b67613

Sync local/* from this host to other:

git bundle create /tmp/koopa-local.bundle local/zusatz local/zusatz-docs local/secret-ui-scrub

scp /tmp/koopa-local.bundle other:/tmp/

# on other:

cd /home/hernani/koopa-admin-log && git fetch /tmp/koopa-local.bundle "+refs/heads/local/:refs/heads/local/"

Pull main:

git fetch origin && git checkout main && git merge --ff-only origin/main

2026-07-17 clone merge

See CLONE-MERGE-2026-07-17.md: uncommitted work lived under a second directory ~/koopa-admin-log (not under taler/src/…); that tree is now a symlink to the canonical clone.