search

spotify2tidal / spotify_to_tidal

A command line tool for importing your Spotify playlists into Tidal
GNU Affero General Public License v3.0
241 stars 44 forks source link

Continuous integration #50 #59

Closed xerexcoded closed 4 weeks ago

xerexcoded commented 1 month ago

I have added a CircleCI configuration to this project, along with a few initial unit tests. This setup will ensure that our tests are automatically run on every commit.

timrae commented 1 month ago

Awesome, great start! Could you please fix the merge conflicts and cleanup the history so there's just a single commit without any merge commits?

xerexcoded commented 1 month ago

I have merged all the changes from your branch with my changes and squashed all of my commit messages to a single one https://github.com/spotify2tidal/spotify_to_tidal/pull/59/commits/4637103c6d97950c68d5f5b1610678bbad249d71

timrae commented 1 month ago

Hmm there are many commits showing not just a single one, perhaps you made an error with git? Could you please take a look?

xerexcoded commented 1 month ago

Hmm there are many commits showing not just a single one, perhaps you made an error with git? Could you please take a look?

I thought squashing them would fix it, could you perhaps guide me to a resource that would help me to do this or maybe you could tell me how to do it?

timrae commented 1 month ago

I'm not sure exactly what you've done to get here, but probably this would fix it, assuming you've added this repo as your upstream remote 

git checkout main
git fetch upstream
git reset --hard upstream/main
git cherry-pick 4637103
git push origin HEAD -f
xerexcoded commented 4 weeks ago

Hey @timrae I have cleaned up the commit history in this commit https://github.com/spotify2tidal/spotify_to_tidal/pull/59/commits/2c4a7f340e88dd7111c3074587a4219f4d31cf86

xerexcoded commented 4 weeks ago

hey @timrae could you review my PR