On 1 July 2014 12:43, Niles Johnson <nil...@gmail.com> wrote: > It sounds like you're in the situation Volker described. I don't think > there's any need to "clean" 16333 if it just contains some commits that are > in the 16332 branch -- branches aren't patches, so (as I understand it) > they already contain the history of every other ticket that's ever been > merged anyway. >
> The goal (in my mind) is that it be easy for a reviewer to tell exactly > what changes are being proposed on the 16333 branch, and to apply and test > them. A git diff between the two branches should show only 16333-relevant > changes. You can also ask git to show you a list of commits that are in > one branch but not another (I forget the syntax at the moment, but it > involves ^) > Thank you both for explaining things. I *think* we're ok to just push them as they are then. Still a couple of things to do and then we'll be doing that :) Thanks again, Vince -- Dr Vincent Knight Cardiff School of Mathematics Senghennydd Road, Cardiff CF24 4AG (+44) 29 2087 5548 www.vincent-knight.com +Vincent Knight @drvinceknight Skype: drvinceknight -- You received this message because you are subscribed to the Google Groups "sage-devel" group. To unsubscribe from this group and stop receiving emails from it, send an email to sage-devel+unsubscr...@googlegroups.com. To post to this group, send email to sage-devel@googlegroups.com. Visit this group at http://groups.google.com/group/sage-devel. For more options, visit https://groups.google.com/d/optout.
