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 error during expansion of !!merge <<: anchor tags #4383

Merged
merged 24 commits into from Mar 23, 2022
Merged

Fix error during expansion of !!merge <<: anchor tags #4383

merged 24 commits into from Mar 23, 2022

Commits on Jan 10, 2022

  1. WIP

    @RafaeLeal
    RafaeLeal committed Jan 10, 2022
    Copy the full SHA
    a23d598 View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2022

  1. Fix merge corner cases

    @RafaeLeal
    RafaeLeal committed Jan 11, 2022
    Copy the full SHA
    b2cdf1d View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/master' into fix-merge-tag

    @RafaeLeal
    RafaeLeal committed Jan 11, 2022
    Copy the full SHA
    3b5403a View commit details
    Browse the repository at this point in the history

  3. Add test for explicit !!merge tag

    @RafaeLeal
    RafaeLeal committed Jan 11, 2022
    Copy the full SHA
    fa352cb View commit details
    Browse the repository at this point in the history

  4. Fix tests

    @RafaeLeal
    RafaeLeal committed Jan 11, 2022
    Copy the full SHA
    7895a86 View commit details
    Browse the repository at this point in the history

  5. Cleanup

    @RafaeLeal
    RafaeLeal committed Jan 11, 2022
    Copy the full SHA
    2c80158 View commit details
    Browse the repository at this point in the history

  6. Cleanup

    @RafaeLeal
    RafaeLeal committed Jan 11, 2022
    Copy the full SHA
    5d6137a View commit details
    Browse the repository at this point in the history

  7. Fix deanchoring lists

    @RafaeLeal
    RafaeLeal committed Jan 11, 2022
    Copy the full SHA
    5c24ab3 View commit details
    Browse the repository at this point in the history

  8. Add test case for keeping comments

    @RafaeLeal
    RafaeLeal committed Jan 11, 2022
    Copy the full SHA
    20363a2 View commit details
    Browse the repository at this point in the history

Commits on Jan 20, 2022

  1. Add MapEntrySetter and fix json marshalling after deanchoring

    @RafaeLeal
    RafaeLeal committed Jan 20, 2022
    Copy the full SHA
    02cf540 View commit details
    Browse the repository at this point in the history

  2. Keep duplicated keys

    @RafaeLeal
    RafaeLeal committed Jan 20, 2022
    Copy the full SHA
    e570dae View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2022

  1. Merge remote-tracking branch 'origin/master' into fix-merge-tag

    @RafaeLeal
    RafaeLeal committed Feb 8, 2022
    Copy the full SHA
    e91608b View commit details
    Browse the repository at this point in the history

  2. Move MergeTag definition to yaml alias

    @RafaeLeal
    RafaeLeal committed Feb 8, 2022
    Copy the full SHA
    a5b526f View commit details
    Browse the repository at this point in the history

  3. Remove go-spew from api

    @RafaeLeal
    RafaeLeal committed Feb 8, 2022
    Copy the full SHA
    a5720df View commit details
    Browse the repository at this point in the history

  4. Add support for sequence nodes on merge tags

    @RafaeLeal
    RafaeLeal committed Feb 8, 2022
    Copy the full SHA
    e7b8c35 View commit details
    Browse the repository at this point in the history

  5. Add docstring to MapEntrySetter.Key

    @RafaeLeal
    RafaeLeal committed Feb 8, 2022
    Copy the full SHA
    3d55196 View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2022

  1. Add docstring to MapEntrySetter struct

    @RafaeLeal
    RafaeLeal committed Feb 24, 2022
    Copy the full SHA
    a5750a6 View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2022

  1. Add tests to MapEntrySetter

    @RafaeLeal
    RafaeLeal committed Feb 25, 2022
    Copy the full SHA
    60a4e82 View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2022

  1. Fix duplicate merge key

    @RafaeLeal
    RafaeLeal committed Mar 3, 2022
    Copy the full SHA
    a9c4541 View commit details
    Browse the repository at this point in the history

  2. Revert whitespace changes on forked go-yaml

    @RafaeLeal
    RafaeLeal committed Mar 3, 2022
    Copy the full SHA
    66f89d4 View commit details
    Browse the repository at this point in the history

  3. Remove AssocMapEntry function

    @RafaeLeal
    RafaeLeal committed Mar 3, 2022
    Copy the full SHA
    44cd517 View commit details
    Browse the repository at this point in the history

  4. Refactoring merge order

    @RafaeLeal
    RafaeLeal committed Mar 3, 2022
    Copy the full SHA
    714a233 View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2022

  1. Return errors on VisitFields and PipeE

    @RafaeLeal
    RafaeLeal committed Mar 23, 2022
    Copy the full SHA
    f760419 View commit details
    Browse the repository at this point in the history

  2. Add tests for each non-conforming map merges

    @RafaeLeal
    RafaeLeal committed Mar 23, 2022
    Copy the full SHA
    78ae5c1 View commit details
    Browse the repository at this point in the history