Changes between Initial Version and Version 1 of Ticket #15580, comment 30


Ignore:
Timestamp:
01/04/14 21:56:53 (6 years ago)
Author:
ohanar
Comment:

Legend:

Unmodified
Added
Removed
Modified
  • Ticket #15580, comment 30

    initial v1  
    22> Why does it say "does not merge cleanly"? It merges cleanly for me...
    33
    4 This particular merge confuses a lot of git tools since the merge there is a new root in your branch. I should be rolling out the new plugin later today, but it won't fix this ticket (or this sort of issue). In the long run, these sorts of merge issues should disappear as all the old repositories get merged.
     4This particular merge confuses a lot of git tools since there is a new root in your branch. I should be rolling out the new plugin later today, but it won't fix this ticket (or this sort of issue). In the long run, these sorts of merge issues should disappear as all the old repositories get merged.