How to find the merge conflict detected by patchbot

[jhonrubia6]

Hi,

recently pushed ticket https://trac.sagemath.org/ticket/23427 and the patchbot fails and the log shows the following lines

Auto-merging src/sage/geometry/hyperbolic_space/hyperbolic_geodesic.py CONFLICT (content): Merge conflict in src/sage/geometry/hyperbolic_space/hyperbolic_geodesic.py

How do I find the conflict it is detecting? in my machine I didn't get any conflict during merging with current develop version before pushing the branch.

Javier

[Dima Pasechnik]

Just merge (or rebase) locally, and push the merged branch.

> --
> 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 sage-devel+...@googlegroups.com.
> To view this discussion on the web visit https://groups.google.com/d/msgid/sage-devel/89e01c18-bb9b-4386-9545-56358ddb9558n%40googlegroups.com.