I wonder how long it's going to take before gogs and gitea get merged, just like it has happened in the past with major forks , nodejs + iojs being one example.
Personally, I tend to consider that to be a wildly successful outcome for an OSS project fork. The project community continues to exist, conflicts get resolved (hopefully amicably), users benefit, developers benefit. Everyone wins!
We will never merge, unless Gogs gets merged into Gitea. We won't merge into Gogs because then only one person will be left as an owner which was the reason for the fork in the first place.
They've split and merged before. This is the second time gitea has forked.
What did gitea contribute the last time they merged?
I think it was at a time when the original maintainer kept silent for a while. When he came back online, gitea stepped back.
Exactly, but then he went silent again for over a month in December. We will continue development of Gitea, even now that he's back.
Yep. The first time was until the owner came back, but he refused to merge the changes on Gogs. The community stopped with Gitea when this happened.
This time, the community patience ended, and Gitea will continue on its own way.