Can't create pull request
I'm trying to create a pull request from shawnjgoff/nb_scripts to accelecon/nb_scripts. The spinner down below the description box goes away, but it doesn't show any diffs. Clicking on the "Create pull request" button shows a spinner to the left, but the spinner goes away and nothing has happened. Clicking on the Compare button shows "Conflict detected", but no more information about the conflict.
The strange behavior started the last time I updated the pull request. I had approved all the commits in the pull request before the update; in the update, only one new commit was added and previous commits remained the same. Some (the first three or so) approval checks in the commits tab of the pull request were previously green but were now grey, even though the showed the same number of approvals. When I clicked on one of the commits to find out what was wrong, it showed my gravatar in the participants list with a check-mark, but the approval button showed "Approve" instead of "Unapprove". I clicked on the approve button, and it unapproved it, and the button correctly kept the "Approve" text; I clicked it again and it approved it, and the button text correctly changed to "Unapprove". Returning to the commits tab of the pull request showed a green check once again, and it still had the correct number of approvals next to it.
Before accepting the pull request, I updated it again: I stripped the new commit and added two new commits (I split the commit up into two commits). Clicking on the pull request "Edit" button took me to the update view, but it didn't show the diffs below (similar to the new view I'm having now). Clicking the "Update pull request" button didn't seem to do anything. I denied the pull request and tried to make another one.