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

Updates to merge policy #80

Merged
merged 5 commits into from
Jun 26, 2014
Merged

Updates to merge policy #80

merged 5 commits into from
Jun 26, 2014

Commits on Jun 25, 2014

  1. Updates to merge policy

    Conrad Stoll committed Jun 25, 2014
    Configuration menu
    Copy the full SHA
    5af13e0 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of github.com:mutualmobile/MMRecord into cnstol… 

    …l_mergePolicy
    Conrad Stoll committed Jun 25, 2014
    Configuration menu
    Copy the full SHA
    ec416b6 View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2014

  1. Adding some more documentation

    Conrad Stoll committed Jun 26, 2014
    Configuration menu
    Copy the full SHA
    f5942cf View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of github.com:mutualmobile/MMRecord into cnstol… 

    …l_mergePolicy
    Conrad Stoll committed Jun 26, 2014
    Configuration menu
    Copy the full SHA
    f0faa26 View commit details
    Browse the repository at this point in the history

  3. Added some additional logging around default merge behavior

    Conrad Stoll committed Jun 26, 2014
    Configuration menu
    Copy the full SHA
    769e34b View commit details
    Browse the repository at this point in the history