Since I received my first ever Teensy, 6 weeks ago, I've been working quite a lot on the audio lib.
Without thinking too much I just copied the Audio folder from the ardiuno application to the libraries folder inside the sketch folder and started programming away.
So far I've fixed a few bugs and made about 6 new objects and then yesterday it hit me, trouble ahead at the next teensyduino update. I will probably have to manually merge the new audiolib with my existing one, bummer.
Github to the rescue?
What I understand so far, please correct me if wrong.
Login to my Github account.
Navigate to Pauls's Teensy Audio library page. https://github.com/PaulStoffregen/Audio
Click the "fork" button. Github redirects me to my own Teensy Audio library page.
Click "Clone or download" and select "Open in Desktop". Github Desktop (osx) opens and ask where to clone.
Select the libraries folder inside the sketch folder and click "clone".
I have now a local copy of "Audio" to work on.
Every time I am happy with my changes I click "commit to master" in Github Destop. This creates a "snapshot" of my progress on my local machine to which i can revert if necessary.
If I want to upload my local repository to Github, I go to the "Repository" menu in Github Desktop and select "Push". My remote repository is now an exact copy of the local one.
Now, Paul updates the audiolib on Github and i would like to merge the new lib with my local one.
Open terminal from Github Desktop and type:
git remote add upstream https://github.com/PaulStoffregen/Audio.git
git fetch upstream
git checkout master
git merge upstream/master
What does the "Update from PaulStoffregen/master" button do in Github Desktop, is it the same as above?
Now, what I don't understand yet.
Let's say I made 2 bug fixes and created 2 new objects and i want to make 2 separate pull requests, one for a bug fix and one for a new object.
Does it make a difference if those 4 changes were committed together or at 4 different times?
Is the point where branching comes into play?
In short, how is it done?
For the bug fix I know it might be easier to post a new issue on the Github page, just trying to wrap my head around all this new git stuff.
Without thinking too much I just copied the Audio folder from the ardiuno application to the libraries folder inside the sketch folder and started programming away.
So far I've fixed a few bugs and made about 6 new objects and then yesterday it hit me, trouble ahead at the next teensyduino update. I will probably have to manually merge the new audiolib with my existing one, bummer.
Github to the rescue?
What I understand so far, please correct me if wrong.
Login to my Github account.
Navigate to Pauls's Teensy Audio library page. https://github.com/PaulStoffregen/Audio
Click the "fork" button. Github redirects me to my own Teensy Audio library page.
Click "Clone or download" and select "Open in Desktop". Github Desktop (osx) opens and ask where to clone.
Select the libraries folder inside the sketch folder and click "clone".
I have now a local copy of "Audio" to work on.
Every time I am happy with my changes I click "commit to master" in Github Destop. This creates a "snapshot" of my progress on my local machine to which i can revert if necessary.
If I want to upload my local repository to Github, I go to the "Repository" menu in Github Desktop and select "Push". My remote repository is now an exact copy of the local one.
Now, Paul updates the audiolib on Github and i would like to merge the new lib with my local one.
Open terminal from Github Desktop and type:
git remote add upstream https://github.com/PaulStoffregen/Audio.git
git fetch upstream
git checkout master
git merge upstream/master
What does the "Update from PaulStoffregen/master" button do in Github Desktop, is it the same as above?
Now, what I don't understand yet.
Let's say I made 2 bug fixes and created 2 new objects and i want to make 2 separate pull requests, one for a bug fix and one for a new object.
Does it make a difference if those 4 changes were committed together or at 4 different times?
Is the point where branching comes into play?
In short, how is it done?
For the bug fix I know it might be easier to post a new issue on the Github page, just trying to wrap my head around all this new git stuff.