nickva commented on PR #4814: URL: https://github.com/apache/couchdb/pull/4814#issuecomment-1806072709
Makes sense that we can just ignore the conflict as they should be the same content. Even if a conflict is generated it should merge cleanly. > I can't trigger the conflict cases locally but I've added a `catch` on the front of `couch_password_hasher`'s call to `AuthModule:update_user_creds`. That would still dump the error in the logs. The error comes from the error logger earlier because we throw inside the spawn_monitor-ed process here and don't catch it: https://github.com/apache/couchdb/blob/5a21bb219485fda5f27c68bf09794711040c38a9/src/chttpd/src/chttpd_auth_cache.erl#L63-L70 We could do a `try ... catch conflict -> exit(conflict) end`. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@couchdb.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
