diff --git a/ops/local-branches-sync.md b/ops/local-branches-sync.md new file mode 100644 index 0000000..0d8314b --- /dev/null +++ b/ops/local-branches-sync.md @@ -0,0 +1,19 @@ +# 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 +