Skip to content

Automatic conflict resolution for vanilla content #2

Open
Open
Automatic conflict resolution for vanilla content#2
Assignees
bcssov
Labels
featureNew feature or request
Milestone
vNext

Description

@bcssov
bcssov
opened on Mar 26, 2020
  1. Load vanilla content along side mod content (perhaps use indexing?)
  2. Use the vanilla defs as the common ancestor to handle automatic merge resolution by creating patches using google-match-patch

Activity

  1. bcssov
    added
    featureNew feature or request
    on Mar 26, 2020
  2. bcssov
    self-assigned this
    on Mar 26, 2020
  3. bcssov
    added this to the 1.1 milestone on Apr 6, 2020
  4. bcssov
    modified the milestones: 1.1, 1.2 on May 16, 2020
  5. bcssov
    modified the milestones: 1.12, vNext on Feb 12, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

Labels

featureNew feature or request

Projects

No projects

    Milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions