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.
