On Tuesday, December 17, 2013 4:20:53 PM UTC, Jeroen Demeyer wrote: > > On 2013-12-17 17:13, Volker Braun wrote: > > the extra merge just clutters the history. > Interesting point. Is that something that should be actively avoided? >
Yes. Just don't do it. Slightly longer answer: only make commits if you have a reason (which then goes into the commit message). Just because there might be a conflict is not a reason (having an actual conflict of course is). Its trivial to check that there is no conflict in case you are worried. Also, git is very good at resolving conflicts later so its not a big deal if there happens to be a conflict with another ticket. -- You received this message because you are subscribed to the Google Groups "sage-git" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/groups/opt_out.
