From 0c2a3ac4e92bfed8b6fd7eb9004449340c6c2bb3 Mon Sep 17 00:00:00 2001
From: John Rommel Estropia <rommel.estropia@gmail.com>
Date: Sat, 7 May 2016 18:13:44 +0800
Subject: [PATCH] fix merge

---
 Sources/Internal/NSManagedObjectContext+Transaction.swift | 4 ++--
 Sources/ObjectiveC/CSBaseDataTransaction.swift            | 4 ++--
 Sources/ObjectiveC/CSCoreStore+Transaction.swift          | 4 ++--
 Sources/ObjectiveC/CSDataStack+Transaction.swift          | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Sources/Internal/NSManagedObjectContext+Transaction.swift b/Sources/Internal/NSManagedObjectContext+Transaction.swift
index c460652..d1dc257 100644
--- a/Sources/Internal/NSManagedObjectContext+Transaction.swift
+++ b/Sources/Internal/NSManagedObjectContext+Transaction.swift
@@ -61,7 +61,7 @@ internal extension NSManagedObjectContext {
         
         get {
             
-            let value: NSNumber? = getAssociatedObjectForKey(
+            let value: NSNumber? = cs_getAssociatedObjectForKey(
                 &PropertyKeys.isSavingSynchronously,
                 inObject: self
             )
@@ -69,7 +69,7 @@ internal extension NSManagedObjectContext {
         }
         set {
             
-            setAssociatedWeakObject(
+            cs_setAssociatedWeakObject(
                 newValue.flatMap { NSNumber(bool: $0) },
                 forKey: &PropertyKeys.isSavingSynchronously,
                 inObject: self
diff --git a/Sources/ObjectiveC/CSBaseDataTransaction.swift b/Sources/ObjectiveC/CSBaseDataTransaction.swift
index ca1f6ca..44be17a 100644
--- a/Sources/ObjectiveC/CSBaseDataTransaction.swift
+++ b/Sources/ObjectiveC/CSBaseDataTransaction.swift
@@ -113,9 +113,9 @@ public class CSBaseDataTransaction: NSObject, CoreStoreObjectiveCType {
      Refreshes all registered objects `NSManagedObject`s in the transaction.
      */
     @objc
-    public func refreshAllObjectsAsFaults() {
+    public func refreshAndMergeAllObjects() {
         
-        self.bridgeToSwift.refreshAllObjectsAsFaults()
+        self.bridgeToSwift.refreshAndMergeAllObjects()
     }
     
     
diff --git a/Sources/ObjectiveC/CSCoreStore+Transaction.swift b/Sources/ObjectiveC/CSCoreStore+Transaction.swift
index ee53662..980d509 100644
--- a/Sources/ObjectiveC/CSCoreStore+Transaction.swift
+++ b/Sources/ObjectiveC/CSCoreStore+Transaction.swift
@@ -98,8 +98,8 @@ public extension CSCoreStore {
      Refreshes all registered objects `NSManagedObject`s in the `defaultStack`.
      */
     @objc
-    public static func refreshAllObjectsAsFaults() {
+    public static func refreshAndMergeAllObjects() {
         
-        CoreStore.refreshAllObjectsAsFaults()
+        CoreStore.refreshAndMergeAllObjects()
     }
 }
diff --git a/Sources/ObjectiveC/CSDataStack+Transaction.swift b/Sources/ObjectiveC/CSDataStack+Transaction.swift
index 6ee4f56..a257825 100644
--- a/Sources/ObjectiveC/CSDataStack+Transaction.swift
+++ b/Sources/ObjectiveC/CSDataStack+Transaction.swift
@@ -98,8 +98,8 @@ public extension CSDataStack {
      Refreshes all registered objects `NSManagedObject`s in the `DataStack`.
      */
     @objc
-    public func refreshAllObjectsAsFaults() {
+    public func refreshAndMergeAllObjects() {
         
-        self.bridgeToSwift.refreshAllObjectsAsFaults()
+        self.bridgeToSwift.refreshAndMergeAllObjects()
     }
 }