From 36a55db6a5902c791caecccbe501630620fa61f5 Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Fri, 2 Mar 2012 12:13:49 -0800
Subject: [PATCH] Don't use local id in comparison on conflict

---
 astrid/src/com/todoroo/astrid/dao/TaskDao.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/astrid/src/com/todoroo/astrid/dao/TaskDao.java b/astrid/src/com/todoroo/astrid/dao/TaskDao.java
index 4d3c608db..687618806 100644
--- a/astrid/src/com/todoroo/astrid/dao/TaskDao.java
+++ b/astrid/src/com/todoroo/astrid/dao/TaskDao.java
@@ -330,6 +330,8 @@ public class TaskDao extends DatabaseDao<Task> {
     private void compareAndMergeAfterConflict(Task existing, Task newConflict) {
         boolean match = true;
         for (Property<?> p : SQL_CONSTRAINT_MERGE_PROPERTIES) {
+            if (p.equals(Task.ID))
+                continue;
             if (!existing.getValue(p).equals(newConflict.getValue(p))) {
                 match = false;
             }