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. I can change the tooltip to read something like "was not able to merge automatically"?
On Fri, Jan 10, 2014 at 5:55 AM, Peter Bruin <[email protected]> wrote: > Hello, > > On #15599, the "branch" field is coloured red and placing the mouse over > it says "does not merge cleanly". However, if I do either "git merge > develop" in my local branch "ticket/15599", or "git merge ticket/15599" in > the "develop" branch, Git merges the two branches without any complaints. > The "develop" branch is at 6.1.beta4; my branch is based on 6.1.beta2. The > patchbot blob on that ticket is also red, but for a seemingly unrelated > reason. Is there any way to find out what causes the "does not merge > cleanly"? > > Thanks, > > 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. > -- Andrew -- 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.
