search

teeworlds-community / teeworlds

A community fork of teeworlds. Trying to have more active maintainers and merge prs faster.
Other
11 stars 1 forks source link

I am planning to hard reset to upstream. Any objections? #119

Closed ChillerDragon closed 3 months ago

ChillerDragon commented 3 months ago

https://github.com/teeworlds-community/teeworlds/forks

Shows that not a single person forked this repository on github. There are new changes merged upstream. We could try to get in the same changes here manually but it would be a diverged git history. I think it would be way cleaner to reset to the official teeworlds repositories master branch.

This will break all pending pull requests and forks. I will make sure the pull requests get fixed again. And as I said I don't think any actual forks get broken by this.

I will leave this issue open for some time. If nobody has any complaints I will at some point do it.

ChillerDragon commented 3 months ago

It has been 3 weeks. Nobody complained and Oy is still gone. I went over all the merged community prs and verified they also all got merged upstream. So I did a hard reset with force push and the community fork is up to date with upstream again.