search

daspartho / SpotiByeAds

Skip spotify ads by automatically restarting application when ad plays
GNU General Public License v3.0
284 stars 41 forks source link

Re-Upload of "Small patch that addresses the "reduce number of requests sent" issue" #47

Closed The-Glit-ch closed 3 years ago

The-Glit-ch commented 3 years ago

Re-Upload due to my branch not being up to data with current branch

(#44)

AnonymouX47 commented 3 years ago

This is can be merged bu the commit history is still not the best. What i was suggesting earlier is quite different... sorry if i caused any misunderstanding.

I checked the main branch of your fork and it was already inconsistent with the upstream's main branch which was caused by your earlier commit https://github.com/The-Glit-ch/SpotiByeAds/commit/798bdfe35a41ab0cf63807472107c83bcac27cc7.

Merging this PR into main branch of https://github.com/daspartho/SpotiByeAds could be catastrophic, it'll lead to inconsistencies in commit histories between upstream's main and the main of every fork.

The solution in a case like this would normally be a rebase of your fork's main branch (which is technically still possible but could be complicated and messy). The simplest solution now is to go back and do this the proper way i.e:

  1. Close this PR.
  2. Delete your own fork of the repo (from it's "settings").
  3. Create a new fork,
  4. Create a new branch (i.e in your fork).
  5. Make the changes.
  6. Open a PR requesting to merge the new branch (having the change) with upstream's main.
  7. Once the PR is merged, you can delete the new branch,
  8. Fetch from upstream's main and merge into your fork's main.
  9. Voila! Problem fixed.

Sorry for any stress caused, it's all for the better... I could make the change but it was your idea and it's normal not leave it to you to make the PR. Thanks

AnonymouX47 commented 3 years ago

@The-Glit-ch Just calling your attention to the comments.

By the way, they're my opinion but i still hope you'd reason along with them.

The-Glit-ch commented 3 years ago

Alright gonna go do that

AnonymouX47 commented 3 years ago

Also, you should probable open the new PR as a draft :)... Others might have suggestions concerning the change,