OK, I see what you mean now. To answer your question, no, these cannot be made independent of each other the way you have them. The pull request will just consider the diff against master. Commit D includes commit F (and all its history), so if you make a pull request with D agains master, it will include both D and F.
If D depends on F, then there's really no other way to do this. You have three options in this case. 1. Make one pull request (i.e., just add D to the pull request with F), 2. Make two pull requests, but require that one go in before the other. This is what Tom did with gsoc-2 and gsoc-3. 3. Don't submit D until F is merged. This isn't very helpful, as you want to get feedback on D as soon as possible. I think 2 is the best approach. This way, the work can be partially merged to master (i.e., F can be merged and D still left for review). To do this with 1, you'd have to do the merge manually (not using GitHub's merge button). 3 clearly goes against what we're trying to do here. If, on the other hand, F and D are independent, then you should restructure your history so that D and F are both based off of master and not each other (it's best to try to do this from the start, but you can also use rebase to get there later if you decide that's what you want). Then, put them in pull requests independently. If you want third work, say G, that is based on both F and D, then create a new branch off of one and merge in the other. The point I was trying to make was that if you only merge (not rebase), once D and F are merged into master, then G will be "based off of master", so if you make a pull request with GitHub, it will just show up naturally. If you were to rebase, you would get junk duplicate commits in the pull request if you tried this. I hope I've made things more, not less clear here :) Aaron Meurer On Wed, Apr 4, 2012 at 5:12 PM, [email protected] <[email protected]> wrote: > On 5 April 2012 00:32, Aaron Meurer <[email protected]> wrote: >> Gmail still destroyed some spaces or something, so I can't really tell >> which letters are supposed to be connected to which. Can you paste it >> at https://gist.github.com/, or somewhere else where it will keep it >> in a monospace font? > > Is the following workflow appropriate: > https://gist.github.com/2306457 > > -- > You received this message because you are subscribed to the Google Groups > "sympy" group. > To post to this group, send email to [email protected]. > To unsubscribe from this group, send email to > [email protected]. > For more options, visit this group at > http://groups.google.com/group/sympy?hl=en. > -- You received this message because you are subscribed to the Google Groups "sympy" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/sympy?hl=en.
