• Len Brown's avatar
    When a merge does not work automatically, git prevents · bd6dbdf3
    Len Brown authored
    commit from running until a change has been made in
    the destination.  In this instance the desired result
    was to choose the destination version of the file
    and ignore the source version, but git would not
    allow that.
    
    Here I added a blank line to let git commit think
    I resolved a merge conflict.
    bd6dbdf3
dswload.c 26.2 KB