Skip to content

Conversation

@fabitom
Copy link

@fabitom fabitom commented Apr 14, 2020

Here is simple ring buffer demo based on Edzelf/ESP32-Radio

@baldram
Copy link
Owner

baldram commented Apr 14, 2020

@fabitom Thank you for the PR.
Is your feature branch merged with the latest master?
I see file changes from the other PR which is already merged to master. So it's some extra noise in this PR. I know it will be theoretically ignored while merging.

@fabitom
Copy link
Author

fabitom commented Apr 14, 2020

right, I just made ring-buffer-demo branch based on previous. But there was no changes. Should I fork again ? what is right way ? I'm not an expert git ;(

@baldram
Copy link
Owner

baldram commented Apr 14, 2020

Should I fork again ? what is the right way?

Definitely not. Just merge the stuff from master to your feature branch.
It would be something like described here.
So the point 1 of this answer. The "feature" is your branch "ring-buffer-demo". Please do a local backup of the folder ;-) Nothing wrong should happen, just in case.

Github describes it also here, but I guess you don't use this GithubDesktop whatever it is.

PS: After all, the PR should be updated, of course.

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.

2 participants