Hi Andrew, Under the hood the trac plugin is now using pygit2 (a python wrapper for > the c library libgit2). Merging is hard and a lot of work has been put into > the git command line to be very smart. libgit2 only added merge support > within the last 6-9 months, so their implementation is not as sophisticated > as that of the git command line, so unfortunately there are occasionally > "git command line" simple merges that are not pygit2 simple merges. >
Thanks, I just did the local automatic merge and pushed the resulting commit, and Trac does not complain anymore. > I can change the tooltip to read something like "was not able to merge > automatically"? > Maybe, but then it is still slightly surprising to the user if his local git _is_ able to merge automatically; I don't think it's terribly important. Peter -- 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.
