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

[fix] Further improve content handling/conflict printing #68

Merged
merged 5 commits into from
Mar 16, 2020
Merged

[fix] Further improve content handling/conflict printing #68

merged 5 commits into from
Mar 16, 2020

Commits on Mar 15, 2020

  1. [fix] Properly merge implicitness of values #43

    @slarse
    slarse committed Mar 15, 2020
    Configuration menu
    Copy the full SHA
    c0aebe4 View commit details
    Browse the repository at this point in the history

  2. [fix] Properly pretty-print merge conflict on super/extends of wildcard 

    #43
    @slarse
    slarse committed Mar 15, 2020
    Configuration menu
    Copy the full SHA
    12f3a9d View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2020

  1. [fix] Resolve content for default method #43

    @slarse
    slarse committed Mar 16, 2020
    Configuration menu
    Copy the full SHA
    412d688 View commit details
    Browse the repository at this point in the history

  2. [fact] Put content merging into separate class #43

    @slarse
    slarse committed Mar 16, 2020
    Configuration menu
    Copy the full SHA
    46acd59 View commit details
    Browse the repository at this point in the history

  3. [fix] Properly handle modifier merge conflict #43

    @slarse
    slarse committed Mar 16, 2020
    Configuration menu
    Copy the full SHA
    211383c View commit details
    Browse the repository at this point in the history