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.

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

fix(add): add handling of merge option #797

Merged
merged 38 commits into from
Jun 6, 2019

Commits on Mar 20, 2019

  1. Configuration menu
    Copy the full SHA
    ce51a0a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    d901d49 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    eb43443 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    66bde9f View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    ff67423 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2019

  1. Configuration menu
    Copy the full SHA
    e5c7f67 View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2019

  1. Configuration menu
    Copy the full SHA
    2299848 View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2019

  1. Configuration menu
    Copy the full SHA
    ccf0dce View commit details
    Browse the repository at this point in the history

Commits on May 28, 2019

  1. chore: merge master

    rishabh3112 committed May 28, 2019
    Configuration menu
    Copy the full SHA
    e839614 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    915c4ab View commit details
    Browse the repository at this point in the history
  3. chore: lint

    rishabh3112 committed May 28, 2019
    Configuration menu
    Copy the full SHA
    5778bdf View commit details
    Browse the repository at this point in the history
  4. chore: lint

    rishabh3112 committed May 28, 2019
    Configuration menu
    Copy the full SHA
    0782944 View commit details
    Browse the repository at this point in the history
  5. chore: lint

    rishabh3112 committed May 28, 2019
    Configuration menu
    Copy the full SHA
    cb5a15f View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    e023d23 View commit details
    Browse the repository at this point in the history

Commits on May 29, 2019

  1. feat: add mergeHandler

    rishabh3112 committed May 29, 2019
    Configuration menu
    Copy the full SHA
    248b9cc View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    1323bbf View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    a2c49e2 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    88eec7c View commit details
    Browse the repository at this point in the history

Commits on May 30, 2019

  1. chore: update parseMerge

    rishabh3112 committed May 30, 2019
    Configuration menu
    Copy the full SHA
    cf85535 View commit details
    Browse the repository at this point in the history
  2. chore: make config const

    rishabh3112 committed May 30, 2019
    Configuration menu
    Copy the full SHA
    445ab31 View commit details
    Browse the repository at this point in the history

Commits on May 31, 2019

  1. chore: update parseMerge

    rishabh3112 committed May 31, 2019
    Configuration menu
    Copy the full SHA
    b6a438d View commit details
    Browse the repository at this point in the history
  2. chore: merge with master

    rishabh3112 committed May 31, 2019
    Configuration menu
    Copy the full SHA
    b7ef7a4 View commit details
    Browse the repository at this point in the history
  3. chore: update prop name

    rishabh3112 committed May 31, 2019
    Configuration menu
    Copy the full SHA
    55d237b View commit details
    Browse the repository at this point in the history
  4. chore: use replaceWith

    rishabh3112 committed May 31, 2019
    Configuration menu
    Copy the full SHA
    6a7e662 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    a89645a View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    5e23da2 View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2019

  1. Configuration menu
    Copy the full SHA
    27c6198 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    8b88980 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2019

  1. chore: merge master

    rishabh3112 committed Jun 5, 2019
    Configuration menu
    Copy the full SHA
    cf8e3c9 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    7481974 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    8609b2b View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    8e3f4ae View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    5ee4169 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    d72ac08 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2019

  1. chore: reorder imports

    rishabh3112 committed Jun 6, 2019
    Configuration menu
    Copy the full SHA
    57b47c3 View commit details
    Browse the repository at this point in the history
  2. chore: reorder imports

    rishabh3112 committed Jun 6, 2019
    Configuration menu
    Copy the full SHA
    8a66c21 View commit details
    Browse the repository at this point in the history
  3. chore: reorder imports

    rishabh3112 committed Jun 6, 2019
    Configuration menu
    Copy the full SHA
    0e0ba8a View commit details
    Browse the repository at this point in the history
  4. chore: group imports

    rishabh3112 committed Jun 6, 2019
    Configuration menu
    Copy the full SHA
    7fe04e9 View commit details
    Browse the repository at this point in the history