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

[feat] Implement fallback for move and delete conflicts #128

Merged
merged 6 commits into from
May 22, 2020
Merged

[feat] Implement fallback for move and delete conflicts #128

merged 6 commits into from
May 22, 2020

Commits on May 21, 2020

  1. Implement rough solution for expressing move conflicts

    @slarse
    slarse committed May 21, 2020
    Configuration menu
    Copy the full SHA
    1c56fd9 View commit details
    Browse the repository at this point in the history

  2. Implement a granular line-based fallback

    @slarse
    slarse committed May 21, 2020
    Configuration menu
    Copy the full SHA
    df31414 View commit details
    Browse the repository at this point in the history

  3. Add some polish

    @slarse
    slarse committed May 21, 2020
    Configuration menu
    Copy the full SHA
    8000e38 View commit details
    Browse the repository at this point in the history

  4. Restore old newline behavior

    @slarse
    slarse committed May 21, 2020
    Configuration menu
    Copy the full SHA
    06504ad View commit details
    Browse the repository at this point in the history

  5. Remove redundant contains method

    @slarse
    slarse committed May 21, 2020
    Configuration menu
    Copy the full SHA
    d7cc766 View commit details
    Browse the repository at this point in the history

  6. Revert name of SpoonTreeBuilder conflicts

    @slarse
    slarse committed May 21, 2020
    Configuration menu
    Copy the full SHA
    ad94ef9 View commit details
    Browse the repository at this point in the history