search

pwittchen / spotify-cli-linux

🎶 A command line interface to Spotify on Linux
https://pwittchen.github.io/spotify-cli-linux
GNU General Public License v3.0
643 stars 55 forks source link

Bash -> Python #62

Closed UltiRequiem closed 3 years ago

UltiRequiem commented 3 years ago

Recreation of #61. All in one commit.

pwittchen commented 3 years ago

Thanks for the update. Can you squash your commits into one to keep clean git history?

UltiRequiem commented 3 years ago

It's ok now?

pwittchen commented 3 years ago

I've added one more comment. After that (and squashing commits again), it should be ok.

pwittchen commented 3 years ago

Github says there are conflicts (after your previous PR). They need to be resolved in order to perform a merge.

UltiRequiem commented 3 years ago

I think you are the one who can solve that.

image

pwittchen commented 3 years ago

I also have this button greyed out (disabled). Conflicts can be resolved via command line by the commiter (you). It's common practice for all projects using git. There are conflicts because you created branch before merging your previous PR. You can do that by pulling upstream source from the main repository and rebasing it with your local repository and branch. If you are not comfortable with git, you can even copy source of this file from the master branch and copy it into your local branch and then do commit and squash your changes.

UltiRequiem commented 3 years ago

63