mfenniak/rethinkdb-net — pull request #177 by lucasjans (2014-10-24 03:02:28+00:00)
Title: Support 1.14's conflict handling (replaces upserts)

@Modify
- adapted the upsert to the new conflict option http://rethinkdb.com/api/javascript/insert/
@Add
- added enum for conflict parameters