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

Continuous integration #50 #59

Merged
merged 1 commit into from
Jun 10, 2024
Merged

Continuous integration #50 #59

merged 1 commit into from
Jun 10, 2024

Conversation

xerexcoded
Copy link
Contributor

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
Copy link
Collaborator

timrae commented Jun 8, 2024

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 xerexcoded force-pushed the main branch 2 times, most recently from e7fa631 to 4637103 Compare June 8, 2024 20:43
@xerexcoded
Copy link
Contributor Author

xerexcoded commented Jun 8, 2024

I have merged all the changes from your branch with my changes and squashed all of my commit messages to a single one 4637103

@timrae
Copy link
Collaborator

timrae commented Jun 8, 2024

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
Copy link
Contributor Author

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
Copy link
Collaborator

timrae commented Jun 8, 2024

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
Copy link
Contributor Author

Hey @timrae I have cleaned up the commit history in this commit 2c4a7f3

@xerexcoded
Copy link
Contributor Author

hey @timrae could you review my PR

@timrae timrae merged commit 692939c into spotify2tidal:main Jun 10, 2024
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

Successfully merging this pull request may close these issues.

None yet

2 participants