I don't really know the workflow to adopt when doing a bit of work on a current dev branch.
I may take some time to (try to) add the playlist functionality for Youtube.
I don't really know the workflow to adopt when doing a bit of work on a current dev branch.
I may take some time to (try to) add the playlist functionality for Youtube.
Zykino
changed title from Fix peertube default playlist to Fix #9 peertube default playlist5 years ago
I rebased my branch on develop... I forgot the PR was on playlist.
Should I redo my PR on develop or maybe if you rebase your branch too it will be ok?
By the way I won't do it for Youtube: lost with the scopes of OAuth (can't update it).
I rebased my branch on develop... I forgot the PR was on playlist.
Should I redo my PR on develop or maybe if you rebase your branch too it will be ok?
By the way I won't do it for Youtube: lost with the scopes of OAuth (can't update it).
Thanks for the work!
I honestly do not know how it'll work when I'll merge, regarding the actual feature, especially as I have done some work on it already :-/
I fear I am still a newbie with gitea ^^
I'll try to review the code and merge without breaking anything, could take some time, sorry in advance :(
Hello,
Thanks for the work!
I honestly do not know how it'll work when I'll merge, regarding the actual feature, especially as I have done some work on it already :-/
I fear I am still a newbie with gitea ^^
I'll try to review the code and merge without breaking anything, could take some time, sorry in advance :(
Me too, I didn't think (force) pushing in my repo would update the PR. My "playlist" branch was based on your and I added one fix commit. Maybe just pick this one (or do the same rebase as me) would do the trick.
I'll be more careful with branches where I do pull requests.
Me too, I didn't think (force) pushing in my repo would update the PR. My "playlist" branch was based on your and I added one fix commit. Maybe just pick this one (or do the same rebase as me) would do the trick.
I'll be more careful with branches where I do pull requests.
The feature will be closed only if it's complete with both youtube and peertube, so I prefer to keep the PR in the feature branch.
With the rebase I have done from develop to feature/playlist, there is still some merge conflict, but nothing big.
If you want to use the Peertube only feature while I get the time to merge, indeed you can rebase it on your fork, eventually without pushing (to not impact the existing PR), or in a new branch ;-)
The feature will be closed only if it's complete with both youtube and peertube, so I prefer to keep the PR in the feature branch.
With the rebase I have done from develop to feature/playlist, there is still some merge conflict, but nothing big.
If you want to use the Peertube only feature while I get the time to merge, indeed you can rebase it on your fork, eventually without pushing (to not impact the existing PR), or in a new branch ;-)
I don't really know the workflow to adopt when doing a bit of work on a current dev branch.
I may take some time to (try to) add the playlist functionality for Youtube.
Fix peertube default playlistto Fix #9 peertube default playlist 5 years agoI rebased my branch on develop... I forgot the PR was on playlist.
Should I redo my PR on develop or maybe if you rebase your branch too it will be ok?
By the way I won't do it for Youtube: lost with the scopes of OAuth (can't update it).
Hello,
Thanks for the work!
I honestly do not know how it'll work when I'll merge, regarding the actual feature, especially as I have done some work on it already :-/
I fear I am still a newbie with gitea ^^
I'll try to review the code and merge without breaking anything, could take some time, sorry in advance :(
Me too, I didn't think (force) pushing in my repo would update the PR. My "playlist" branch was based on your and I added one fix commit. Maybe just pick this one (or do the same rebase as me) would do the trick.
I'll be more careful with branches where I do pull requests.
I'll redo the PR against develop (since I rebased on it and did the merging)
The feature will be closed only if it's complete with both youtube and peertube, so I prefer to keep the PR in the feature branch.
With the rebase I have done from develop to feature/playlist, there is still some merge conflict, but nothing big.
If you want to use the Peertube only feature while I get the time to merge, indeed you can rebase it on your fork, eventually without pushing (to not impact the existing PR), or in a new branch ;-)
8d24bfa6a1
.