[shakna]

gitea was initially just a fork so development could continue - with every intention of merging it back into gogs.

However, Unknwon, responded here [0], let me point out his main reason for not merging back:

> Gitea won't be merged back to Gogs, it's not about merging work is huge and hard, it's the differences of fundamental philosophy. I personally do not like to push hard to release new features, but make code neat and clean, it's not good for business, but Gogs isn't a business, making it is what I love to do.

[0] https://github.com/gogits/gogs/issues/1304#issuecomment-1246...