Closed emiliom closed 9 years ago
@emiliom I don't have the option to merge the pull request. I worked on the Read.Me file this morning. Would that have "cancelled out" the pull request?
@robragsdale , you own the repository, so you must have merge admin rights. I believe you're the only who has those rights at this time. Creating a newer version of the file doesn't disallow merging; it just makes it a bit more time consuming, since you'll have to work through changes when there are conflicts between your new edits and the ones on the pull request.
Damn!!! This is going to be a test of my git skills. I'll see if I can resolve.
I'll look into how to merge this, too.
Didn't change any the content per se. Only fixed the specification of links and anchors that were broken b/c they followed the Google wiki syntax rather than Markdown syntax. Didn't check if new content or changes were applied on the master README.md, since I first forked it around 8/21