search

mediawiki-client-tools / mediawiki-dump-generator

Python 3 tools for downloading and preserving wikis
https://github.com/mediawiki-client-tools/mediawiki-scraper
GNU General Public License v3.0
89 stars 14 forks source link

Enable Rebase Merge on this repo #115

Closed NyaMisty closed 1 year ago

NyaMisty commented 1 year ago

Do not use squash merge, that forces Git to combine several commit into a huge one, very bad.

NyaMisty commented 1 year ago

@elsiehupp

NyaMisty commented 1 year ago

Also I strongly advice you to give other member more permission. Currently there's several problems:

  1. I don't have any write access
  2. You didn't enable rebase merge, which is a very very bad idea for big multi-commit PR I'm always posting
  3. You protected the master branch, so we have no way to recover those squashed commits and rebase them

If you do concern the repo security you can do the backup regularly instead :).

elsiehupp commented 1 year ago

You didn't enable rebase merge, which is a very very bad idea for big multi-commit PR I'm always posting

I did this because when I have done pull requests with Nextcloud, they always say to squash before merging, and if there are too many changes for this to be reasonable, to do multiple pull requests.

That said, I re-enabled all the various types of merges, since I don't have that strong a preference, either way, and reviewers can make recommendations as they see fit.

I also just changed the default member permissions to "write". The only other person I'd be comfortable giving full admin access at this point is Federico, and in that case the thing to do would be transferring repositories to his existing organization.

Regarding protecting the master branch... if you have a specific recommendation of how I could do mandatory pull request reviews without doing so, let me know, but other than that I would say that's what other branches are for?

elsiehupp commented 1 year ago

By the way, regarding tagging me: right now I get a firehose of email from this repository, and I'm not sure how to dial it down, so if you want to get ahold of me specifically, the best way is to email me using the email on the "Collaborators" pinned discussion.