sympy/sympy-bot — Issue #60: The merge conflicts should be posted somewhere
Author: asmeurer
Created: 2011-10-22 05:35:48+00:00
State: open

Sometimes when a branch can't be merged cleanly, the conflict is just a trivial fix (like an import change), and sometimes it's not, but the point is that we don't know unless we manually try it. So SymPy-Bot should put what the conflicts are when it can't merge cleanly so that we can see if it's something that we can just easily fix or not.