If you want to know exactly how it is currently working, it is this one line
https://github.com/sagemath/sage_trac_plugin/blob/dddc41b60a7620ebe0e224973497d83c719d9cd9/sage_trac/git_merger.py#L92 (the rest of that function deals with trivial merges, and writing unreferenced objects back to trac's git repository) On Thu, May 28, 2015 at 12:39 AM, Volker Braun <[email protected]> wrote: > The commandline git client is better at merging, so sometimes it succeeds > where pygit2/libgit2 fails. > > > > On Thursday, May 28, 2015 at 8:42:46 AM UTC+2, Jeroen Demeyer wrote: >> >> Hello, >> >> I frequently see "red links" on Trac git branches with the message >> "trac's automerging failed". But when I try to merge with latest develop >> using the git command line, the merge succeeds without conflicts. Why is >> this? What does the Trac git plugin do to merge? >> >> And a different problem is that ticket dependencies aren't taken into >> account, but I know I lost that battle long ago. >> >> Jeroen. >> > -- > 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 [email protected]. > To post to this group, send email to [email protected]. > Visit this group at http://groups.google.com/group/sage-devel. > For more options, visit https://groups.google.com/d/optout. > -- Andrew -- 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 [email protected]. To post to this group, send email to [email protected]. Visit this group at http://groups.google.com/group/sage-devel. For more options, visit https://groups.google.com/d/optout.
