Re merge conflict. In the same session I had previously completed the Prez report (without incident), I can't think of an action of mine that might have caused a merge inflict.
The browser (IE) did not noticeably report an error, although I probably didn't wait for the response as there isn't one, even on success. There is no feedback to monitor. I can't recall how I noticed it had not saved. I guess I I simply switched back to the browser and saw the empty page before moving on to my next task. I did the successful edit in Chrome, but earlier edits were in IE. I also did subsequent Prez edits in IE with no concerns. Sorry I cant give you reproducible steps. Sent from my Windows Phone ________________________________ From: Sam Ruby<mailto:[email protected]> Sent: 12/15/2015 7:28 AM To: [email protected]<mailto:[email protected]> Subject: Re: Board report On Tue, Dec 15, 2015 at 3:09 AM, Ross Gardler <[email protected]> wrote: > Thank goodness I copied the content here as Whimsy lost it for me (I'll try > and reproduce when I have more time and report the bug). >From the server logs (the key piece of data is the "500") (note, I removed IP and user agent info): rgardler [15/Dec/2015:08:03:08 +0000] "POST /board/agenda/json/post HTTP/1.1" 500 1865 "https://na01.safelinks.protection.outlook.com/?url=https%3a%2f%2fwhimsy.apache.org%2fboard%2fagenda%2f2015-12-16%2fWhimsy&data=01%7c01%7cRoss.Gardler%40microsoft.com%7c1fe940fd0f2b42c94f5708d30564609d%7c72f988bf86f141af91ab2d7cd011db47%7c1&sdata=Ycds97IX%2f9C4aGE0fNpZQdaO5LwTj2pUwbLNsavFJ%2bo%3d"; _ERROR #<Exception: Merge conflict> _WARN /srv/rack/whimsy-agenda/views/actions/post.json.rb:43:in `block in _evaluate' I see similar log entries for curcuru [14/Dec/2015:20:20:35 +0000]. So, two questions: (1) why was there a "Merge conflict", and (2) why did the client complete the request without reporting the failure and retaining the post? I see the second as the more important question. The server did respond with a status of 500, so the client should not have completed the request. - Sam Ruby
