summaryrefslogtreecommitdiff
path: root/Development.md
diff options
context:
space:
mode:
authorAnthony Wang2022-04-29 00:08:07 +0800
committerAnthony Wang2022-04-29 00:08:07 +0800
commitd0c827be648f7e14ed66ca7d82d4d4247e85c3e6 (patch)
tree4273a5d230b49bcaf012306a3ec2ff809d8690b8 /Development.md
parent3d47f98a21cc40bf8cd01968d203c96d819caa71 (diff)
Make main branch the development branch
Diffstat (limited to 'Development.md')
-rw-r--r--Development.md3
1 files changed, 1 insertions, 2 deletions
diff --git a/Development.md b/Development.md
index 0ba8332..bb90592 100644
--- a/Development.md
+++ b/Development.md
@@ -2,8 +2,7 @@
The [repository](https://gitea.com/Ta180m/gitea) has several branches:
-* [main](https://gitea.com/Ta180m/gitea/src/branch/main) is a duplicate of Gitea main.
-* [dev](https://gitea.com/Ta180m/gitea/src/branch/dev) is where development happens and is deployed for testing at https://git.exozy.me/. Commits to the dev branch are usually cherry-picked to the feature branches as needed.
+* [main](https://gitea.com/Ta180m/gitea/src/branch/dev) is where development happens and is deployed for testing at https://git.exozy.me/. Commits to this branch are usually cherry-picked to the feature branches as needed.
* [feature-activitypub](https://gitea.com/Ta180m/gitea/src/branch/feature-activitypub) corresponds to [PR #19133](https://github.com/go-gitea/gitea/pull/19133).
* [feature-manual-inbox-outbox](https://gitea.com/Ta180m/gitea/src/branch/feature-manual-inbox-outbox) contains an experimental inbox/outbox implementation. I will make a new branch with cleaner code for my upcoming inbox/outbox Gitea PR.