Skip to content

some future changes coming from upstream

dakkar requested to merge future into develop

What does this PR do? I'm trying a new strategy to make merges from upstream less painful

I've created a future branch into which I'll merge misskey's develop and our develop, relatively frequently (I'll try for at least once per week)

The idea is that I won't pollute our develop with incomplete features from upstream, but that merging future into our develop should be trivial, at the time upstream releases something.

So we can make Sharkey releases from our develop whenever we want (it will only contain the latest upstream stable release, plus our work), and we don't get to scramble to make a giant merge when upstream makes a release.

Please review these changes, but don't merge them. In the future I'll create MR into future, so we can review upstream changes incrementally.

Contribution Guidelines By submitting this merge request, you agree to follow our Contribution Guidelines

  • I agree to follow this project's Contribution Guidelines
  • I have made sure to test this pull request

Merge request reports