From 1426f0932e601254852ee1f6b57ff4fa5a4123d5 Mon Sep 17 00:00:00 2001 From: Anthony Wang Date: Tue, 21 Jun 2022 05:00:38 +0800 Subject: Simplify workflow --- Development.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Development.md b/Development.md index 8f51fbb..3238eb3 100644 --- a/Development.md +++ b/Development.md @@ -2,9 +2,8 @@ The [repository](https://gitea.com/Ta180m/gitea) has several branches: -* [feature-activitypub](https://gitea.com/Ta180m/gitea/src/branch/feature-activitypub) corresponds to [PR #19133](https://github.com/go-gitea/gitea/pull/19133). -* [feature-go-ap-inbox-outbox](https://gitea.com/Ta180m/gitea/src/branch/feature-activitypub) corresponds to (insert future Gitea PR). -* [main](https://gitea.com/Ta180m/gitea/src/branch/main) is deployed to https://git.exozy.me/ when I'm not testing any of the other branches. Development action happens on the other branches and then the commits are merged to this branch. +* [main](https://gitea.com/Ta180m/gitea/src/branch/main) corresponds to (insert future Gitea PR). Development mainly happens on this branch. +* [feature-activitypub](https://gitea.com/Ta180m/gitea/src/branch/feature-activitypub) corresponds to [PR #19133](https://github.com/go-gitea/gitea/pull/19133) which has been merged. All the other branches mostly contain some experimental or old code and aren't important. -- cgit v1.2.3-70-g09d2