Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix iPhone error (NSMergeConflict for NSManagedObject) #20

Open
wants to merge 14 commits into
base: master
Choose a base branch
from
Open

fix iPhone error (NSMergeConflict for NSManagedObject) #20

wants to merge 14 commits into from

Commits on Sep 19, 2014

  1. fix iPhone error (NSMergeConflict for NSManagedObject)

    @xhzengAIB
    xhzengAIB committed Sep 19, 2014
    Configuration menu
    Copy the full SHA
    b10c725 View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2014

  1. publish api method

    @xhzengAIB
    xhzengAIB committed Sep 22, 2014
    Configuration menu
    Copy the full SHA
    6544dbf View commit details
    Browse the repository at this point in the history

  2. Update Nimble.podspec

    @xhzengAIB
    xhzengAIB committed Sep 22, 2014
    Configuration menu
    Copy the full SHA
    f3295f6 View commit details
    Browse the repository at this point in the history

  3. Update Nimble.podspec

    @xhzengAIB
    xhzengAIB committed Sep 22, 2014
    Configuration menu
    Copy the full SHA
    25a7cf4 View commit details
    Browse the repository at this point in the history

  4. Update Nimble.podspec

    @xhzengAIB
    xhzengAIB committed Sep 22, 2014
    Configuration menu
    Copy the full SHA
    bb67926 View commit details
    Browse the repository at this point in the history

  5. Update Nimble.podspec

    @xhzengAIB
    xhzengAIB committed Sep 22, 2014
    Configuration menu
    Copy the full SHA
    93c35cb View commit details
    Browse the repository at this point in the history

  6. Update Nimble.podspec

    @xhzengAIB
    xhzengAIB committed Sep 22, 2014
    Configuration menu
    Copy the full SHA
    3561257 View commit details
    Browse the repository at this point in the history

  7. Update Nimble.podspec

    @xhzengAIB
    xhzengAIB committed Sep 22, 2014
    Configuration menu
    Copy the full SHA
    86b8bbe View commit details
    Browse the repository at this point in the history

  8. fix CoreData import error

    @xhzengAIB
    xhzengAIB committed Sep 22, 2014
    Configuration menu
    Copy the full SHA
    7a92030 View commit details
    Browse the repository at this point in the history

  9. fix the property error

    @xhzengAIB
    xhzengAIB committed Sep 22, 2014
    Configuration menu
    Copy the full SHA
    6c9015b View commit details
    Browse the repository at this point in the history

  10. publish api method

    @xhzengAIB
    xhzengAIB committed Sep 22, 2014
    Configuration menu
    Copy the full SHA
    29aec0b View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2014

  1. fix the error with MergePolicy properties

    @xhzengAIB
    xhzengAIB committed Sep 23, 2014
    Configuration menu
    Copy the full SHA
    b256e04 View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2014

  1. fix *** Collection <__NSCFSet: 0x16d72970> was mutated while being en… 

    …umerated.

fix #21
    @xhzengAIB
    xhzengAIB committed Sep 29, 2014
    Configuration menu
    Copy the full SHA
    211885a View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2014

  1. delete the error code.

    @xhzengAIB
    xhzengAIB committed Oct 9, 2014
    Configuration menu
    Copy the full SHA
    12b3e32 View commit details
    Browse the repository at this point in the history