On Friday, May 30, 2014 1:18:43 PM UTC+1, kcrisman wrote: > > Hmm, I was kind of going on the "avoid unnecessary merges" thing. >
You can of course do whatever you want on your computer as long as you don't upload it... Also I am scared about merge conflicts, which I do not know how to handle > because I don't have a "merge editor" > You don't need anything special, imho the standard git procedure of adding conflict markers and editing that file is perfectly fine (and what I use most of the time even though I have some special merge editors). Volker, is there some similar functionality in "git trac"? > No (it doesn't really do anything different as far as communicating with trac goes), but we could easily add it... -- 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.
