On Thu, May 29, 2014 at 10:29 AM, Travis Scrimshaw <tsc...@ucdavis.edu> wrote: > I never really have had a problem with the new workflow (in fact, I > actually prefer it to the old one). However I had a good command of git > coming into this and read the "git the hard way". So my 2 cents would be to > have developers spend time learning git properly instead of using the dev > scripts (I think this is a useful skill beyond Sage development).
Yes, yes, yes. "git trac" fits well here to plug in only the sage-specific bits. > However I > do see your point that this is an extra barrier to Sage development since > IMO one generally needs to know more about git than about Hg in order to > development. > > >> 1) Put "Merged in" back. > > > +1 I'd also suggest not closing/merging tickets until shortly before > releasing the next beta. Why? >> 2) Fix just how much crazy stuff shows up in "git log", presumably by >> merging things differently or with different messages or something. > > I don't think there's much we can do about this considering how git > workflows are suppose to work and since the develop does have everything > merged in. On this note, I think the ticket description is the perfect thing to put in the merge commit. People should be more aware of that, and craft (sometimes as the ticket evolves) good descriptions that describe exactly what the ticket is about. - Robert -- 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.