3 Commits

Author	SHA1	Message	Date
drh	1c92853dac	Change to five conflict resolution algorithms: ROLLBACK, ABORT, FAIL, ... IGNORE, and REPLACE. This checkin is code only. Documentation and tests are still needed. Also, ABORT is not fully implemented. (CVS 360) FossilOrigin-Name: d0e7cf4a83e6abad7129bed356b7492dddaff474	2002-01-31 15:54:21 +00:00
drh	59fefbab1a	Update the FAQ. Change the GMT timezone label to UTC on all files. (CVS 318) ... FossilOrigin-Name: f1a5808288e4204aee03531de0b9e6646062bd94	2001-11-24 13:23:04 +00:00
drh	382c0247c7	Adding table column query capability to support ODBC. (CVS 278) ... FossilOrigin-Name: b63b3f3684a3d584ef99f54cde76b6c483bbfef7	2001-10-06 16:33:02 +00:00