+[2014-12-07T21:52:34Z]offby1beats me! +[2014-12-07T23:26:46Z]VxJasonxVbah +[2014-12-07T23:26:50Z]VxJasonxVI have a good answer for that too +[2014-12-07T23:26:52Z]VxJasonxVsigh +[2014-12-07T23:28:19Z]VxJasonxVNevik_: that's what you think
Should've gone to education@github.com, I used the contact form on the education site
+[2014-12-08T02:34:22Z]swillscan someone look at this pull request and tell me what i need to do to make it not include already merged commits and my merge of that? https://github.com/swills/manatee/compare/joyent:master...master +[2014-12-08T02:42:21Z]psgsswills, In that case, I would recommend you create a new branch in your repository and make the changes again, then request a pull from your new branch to joyent/manatee. +[2014-12-08T02:43:00Z]psgsIt may also be useful to create new features in separate branches by default in future, as it allows you to pick and choose what you would like to submit in a pull request more easily. +[2014-12-08T02:53:07Z]swillsso from what i gather, the only way to sort this out is either for me to create all changes i want merged in a branch ahead of time or for the merger to cherry pick my changes. is that right? +[2014-12-08T03:13:19Z]psgsI believe so swills.