From 9662aee375e358b9531c30f17fb6cb453046a7a9 Mon Sep 17 00:00:00 2001 From: Michael Jerger Date: Mon, 12 Feb 2024 10:14:16 +0100 Subject: [PATCH] reflect hard fork --- docs/unsure-where-to-put/dev-notes.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/unsure-where-to-put/dev-notes.md b/docs/unsure-where-to-put/dev-notes.md index df38c764a0..361927b897 100644 --- a/docs/unsure-where-to-put/dev-notes.md +++ b/docs/unsure-where-to-put/dev-notes.md @@ -106,13 +106,13 @@ git clone https://git.exozy.me/a/gitea.git exosy git remote add forgejo git@codeberg.org:forgejo/forgejo.git # rebase on top of forgejo/forge-development -git switch forgejo-development +git switch forgejo git fetch forgejo git reset --hard forgejo/forgejo-development git push --force git switch forgejo-federated-star -git rebase forgejo-development +git rebase forgejo git push --force # continue local development after rebase & force-push has happened