search

EliAndrewC / sideboard

BSD 3-Clause "New" or "Revised" License
0 stars 0 forks source link

fixes #28 #51

Closed EliAndrewC closed 10 years ago

EliAndrewC commented 10 years ago

Ok, this time is seems to have rebased properly. Not sure what went wrong with the last rebase.

As before, I'll start leaving comments on individual pieces.

EliAndrewC commented 10 years ago

Ok, so apparently when you make ANY commit and push to a repo while an outstanding pull request is open, it automatically gets added to the pull request. There doesn't seem to be a way around this without making a different branch for each pull request: http://stackoverflow.com/questions/16984169/github-how-to-submit-individual-pull-request-in-case-of-multiple-commits

Alas, next time I'll do the branching thing, or just make sure the previous pull request is closed.

ftobia commented 10 years ago

Looks good to me.

It took a little while for me to get used to developing on multiple branches. It's slightly more work, e.g. I don't develop on master or develop anymore, but it's not too bad.

EliAndrewC commented 10 years ago

Ok, so from now on, I'm going to do what Github seems to think I should be doing w.r.t. pull requests, and instead of working out of my own repo, I'll just make a branch for each pull request and issue the pull request from within this repo.

However, since I'm going to be working on some other features which rely on this one, I'm going to go ahead and merge this pull request now. It sounds like @ftobia has sanity checked it, and we can make changes later if @robdennis has any concerns.