Changes between Version 1 and Version 2 of Ticket #22189, comment 16


Ignore:
Timestamp:
01/31/17 14:46:06 (6 years ago)
Author:
charpent
Comment:

Legend:

Unmodified
Added
Removed
Modified
  • Ticket #22189, comment 16

    v1 v2  
    22> I squashed the two commits and forced a push. This should fix the merge problem.
    33
    4 No, it doesn't : there is still a merge conflict. I'm stuck.
     4No, it doesn't : there is still a merge conflict, requiring to manually pick the "right" versin of the last line of {{{src/doc/en/installation/source.rst}}} (i. e. what was fixed by [https://git.sagemath.org/sage.git/commit/?id=a37c08e12c28568985e1269ce25cfabbb3b26871 the second commit]). I do not understand why, and I'm stuck.