search

jawher / xavr

An AVR C project template for XCode
MIT License
68 stars 18 forks source link

User Serial Port Name (Fixed) #9

Closed CallumA closed 9 years ago

CallumA commented 9 years ago

Fixes a bug where the user's serial port may not be the same as hardcoded value, allows the serial port to be set as a variable on project creation and defaults to /dev/cu.usbmodem*

jawher commented 9 years ago

@CallumA : Thank you very much for this contribution.

I just tested your patch and it works beautifully.

If you could just squash the 4 commits into one and re-push, that would be cool.

CallumA commented 9 years ago

Sorry, I'm new to GitHub so I'm not entirely sure how you do that. I think I could probably but it in to two commits since there are two files but I don't know about one.

CallumA commented 9 years ago

I'll close this pull request and my branch and recreate it, I think that's the only way I can find to do this.

jawher commented 9 years ago

@CallumA no worries. Git can be a handful in the beginning but not too hard to pick up.

Inb your case, you could have done what is called an interactive rebase: you want to squash the last 4 commits of a branch into a single commit:

git rebase -i HEAD~4

There are many online resource on this subject, for example this atlassian tutorial.