Closed nerdoug closed 4 years ago
seems strange that merge doesn't have conflicts?
oops. I accidentally ended up with main.cpp.txt due to way I restored my changed code. Need to abort this pull request, and I think that's what the "Close and comment" button does if you haven't done the merge.
seems strange that merge doesn't have conflicts?