[PR #667] [MERGED] Sync branches so v3 uses latest master #986

New issue

Closed

opened 2026-02-28 00:03:07 +03:00 by kerem · 0 comments

kerem commented

2026-02-28 00:03:07 +03:00

Owner

📋 Pull Request Information

Original PR: https://github.com/spotipy-dev/spotipy/pull/667
Author: @stephanebruckert
Created: 4/10/2021
Status: ✅ Merged
Merged: 4/10/2021
Merged by: @stephanebruckert

Base: v3 ← Head: rebase

📝 Commits (1)

285b33d Sync branches

📊 Changes

4 files changed (+9 additions, -9 deletions)

View changed files

📝 CHANGELOG.md (+6 -7)
📝 examples/artist_discography.py (+1 -0)
📝 examples/simple3.py (+1 -0)
📝 spotipy/client.py (+1 -2)

📄 Description

@Peter-Schorn merging master into v3 was conflicting a bit, I think in the future it'll be easier to do the v2 change in v2 first, and then incorporate that change in v3

Otherwise rebasing becomes difficult, as git isn't clever enough to detect that 2 different commits can have the same piece of code. Feature should be committed once, and then merged into other branches so they share the same references

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/spotipy-dev/spotipy/pull/667 **Author:** [@stephanebruckert](https://github.com/stephanebruckert) **Created:** 4/10/2021 **Status:** ✅ Merged **Merged:** 4/10/2021 **Merged by:** [@stephanebruckert](https://github.com/stephanebruckert) **Base:** `v3` ← **Head:** `rebase` --- ### 📝 Commits (1) - [`285b33d`](https://github.com/spotipy-dev/spotipy/commit/285b33d1a90e45e8d3299e6a2220bf220760fa27) Sync branches ### 📊 Changes **4 files changed** (+9 additions, -9 deletions) <details> <summary>View changed files</summary> 📝 `CHANGELOG.md` (+6 -7) 📝 `examples/artist_discography.py` (+1 -0) 📝 `examples/simple3.py` (+1 -0) 📝 `spotipy/client.py` (+1 -2) </details> ### 📄 Description @Peter-Schorn merging master into v3 was conflicting a bit, I think in the future it'll be easier to do the v2 change in v2 first, and then incorporate that change in v3 Otherwise rebasing becomes difficult, as git isn't clever enough to detect that 2 different commits can have the same piece of code. Feature should be committed once, and then merged into other branches so they share the same references --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>