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

#1190 - limit merge methods #2224

Merged
merged 9 commits into from
Jan 22, 2021
Merged

#1190 - limit merge methods #2224

merged 9 commits into from
Jan 22, 2021

Commits on Oct 17, 2020

  1. added to repo struct and working on fetching merge opts for repo

    @divbhasin
    divbhasin committed Oct 17, 2020
    Configuration menu
    Copy the full SHA
    5f67ddc View commit details
    Browse the repository at this point in the history

  2. refactoring

    @divbhasin
    divbhasin committed Oct 17, 2020
    5 Configuration menu
    Copy the full SHA
    8b0618f View commit details
    Browse the repository at this point in the history

Commits on Jan 21, 2021

  1. Merge branch 'trunk' into 1190-limit-merge-methods

    @samcoe
    samcoe committed Jan 21, 2021
    Configuration menu
    Copy the full SHA
    a912396 View commit details
    Browse the repository at this point in the history

  2. Fix merge

    @samcoe
    samcoe committed Jan 21, 2021
    Configuration menu
    Copy the full SHA
    71a66cc View commit details
    Browse the repository at this point in the history

  3. Retrieve repo outside of survey function

    @samcoe
    samcoe committed Jan 21, 2021
    Configuration menu
    Copy the full SHA
    2d782fc View commit details
    Browse the repository at this point in the history

  4. Split apart interactive merge survey function

    @samcoe
    samcoe committed Jan 21, 2021
    Configuration menu
    Copy the full SHA
    a305ff1 View commit details
    Browse the repository at this point in the history

  5. Fix tests

    @samcoe
    samcoe committed Jan 21, 2021
    Configuration menu
    Copy the full SHA
    7cc2975 View commit details
    Browse the repository at this point in the history

  6. Cleanup impossible code path

    @samcoe
    samcoe committed Jan 21, 2021
    Configuration menu
    Copy the full SHA
    11e873c View commit details
    Browse the repository at this point in the history

  7. Add mergeMethodSurvey test

    @samcoe
    samcoe committed Jan 21, 2021
    Configuration menu
    Copy the full SHA
    f09b8a8 View commit details
    Browse the repository at this point in the history