Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merging PRs of UAD #37

Open
AnonymousWP opened this issue Sep 4, 2023 · 4 comments
Open

Merging PRs of UAD #37

AnonymousWP opened this issue Sep 4, 2023 · 4 comments

Comments

@AnonymousWP
Copy link

AnonymousWP commented Sep 4, 2023

If you're familiar with UAD, you've probably seen some of my PRs too. After creating loads of PRs for UAD, I now stopped making extensive PRs that add bloatware because it feels useless to file PRs while the project seems dead. I got the suggestion to look at your repos. Looking promising so far. 🙂

So I'm now trying to figure out how (and if technically possible) we can merge my PRs to your repo. I know the structure and attributes are different from UAD, but perhaps a script will do it. Do you have any ideas?

@MuntashirAkon
Copy link
Owner

I have a few ideas. But here's the best one:

  1. Merge all your PRs into a branch in your own repo. Make sure the branch is up-to-date with Winston's master branch before.
  2. Fork this repo and edit this line to set the target repository to yours instead of Winston's.
  3. Replace this line with the latest commit hash in your repo (instead of Winston's)
  4. Install PHP 8.1 (or later)
  5. Run the above script from project root, e.g.
    php scripts/update_uad.php

You should get a diff-like output in your terminal if it supports colours (I haven't actually test the script though). Now, inspect those changes to see if you've got anything to add or remove (or even, whether the script actually worked as expected).

@GrabbenD
Copy link

GrabbenD commented Sep 5, 2023

Not sure if this is up to date but it sounds like it might be doable from the webpage:
https://stackoverflow.com/a/28729484


If not, here's a manual approch with git commands (but you'll have to keep track of which PRs are done):
https://stackoverflow.com/a/49919432

Here's a example which uses regex to import PRs (don't copy and paste the commands though, this is just to give you an idea of how):
https://stackoverflow.com/a/41926958


If that's too tedious I know there's projects like Gitkraken which give you a GUI where you can do everything on the fly by just drag and dropping, like adding remote branches into local (here's screenshots to give you a idea, not steps):
add-fork-remote

github-assignee@2x-1600x1314-1-1024x841

@MuntashirAkon
Copy link
Owner

@GrabbenD: It's not necessary to follow these complicated ways if you know how to use a Terminal. If the branches in the PR still exist in @AnonymousWP's repo, they can be merged via git command. Otherwise, they can be merged manually by downloading the .patch files for each PR and then using git command (this can be turned into a script also if there's an incredibly large number of PRs). I can do this too in my end. But then, git will erroneously assign me as the contributor.

@Obegg

This comment was marked as resolved.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

4 participants