Skip to content

Settings and activity

1 result found

  1. 13 votes
    Vote

    We're glad you're here

    Please sign in to leave feedback

    Signed in as (Sign out)
    You have left! (?) (thinking…)
    How important is this to you?

    We're glad you're here

    Please sign in to leave feedback

    Signed in as (Sign out)
    An error occurred while saving the comment
    Jerome Dayton commented  · 

    The process should be something like this. Reconstruct database as of last "get latest". Create two set's of diff's. 1) Latest source control version to latest get. 2) Current local database to "get latest". Then identify any resulting conflicts. When conflicts (if any) have been resovled, then apply 1) to local db. Now create diff set three that is the changes between local db and latest source controlled version and check it in.

    An error occurred while saving the comment
    Jerome Dayton commented  · 

    And the reverse also applies. When a new insertion is identified, is it because 1) it is truly new or 2) it is has been deleted from the latest source control version. In case 1), we drive the insertion into the latest source control version. In case 2), we identify a conflict and have the developer resolve it.

    Case 2 should be identified in the "get latest" phase, in particular if the developer has made changes to a row that is about to be deleted!

    Jerome Dayton shared this idea  ·