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

Conflict tracking #5037

Merged
merged 3 commits into from Feb 14, 2018
Merged

Conflict tracking #5037

merged 3 commits into from Feb 14, 2018

Commits on Feb 11, 2018

  1. More directly track conflicts in backtracking, hopefully this will be… 

    … easier to extend.
    @Eh2406
    Eh2406 committed Feb 11, 2018
    Configuration menu
    Copy the full SHA
    201fdba View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2018

  1. Use the conflict tracking in the error messages to only show the vers… 

    …ions that are in conflict
    @Eh2406
    Eh2406 committed Feb 13, 2018
    Configuration menu
    Copy the full SHA
    a028221 View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2018

  1. Don't store conflicting_activations for backtracking. 

    If we need it later we can always add it back in.
    @Eh2406
    Eh2406 committed Feb 14, 2018
    Configuration menu
    Copy the full SHA
    8899093 View commit details
    Browse the repository at this point in the history