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

introduce --merge to bring up merge editor (for #5770) #155039

Merged
merged 19 commits into from
Jul 18, 2022
Merged

introduce --merge to bring up merge editor (for #5770) #155039

merged 19 commits into from
Jul 18, 2022

Commits on Jul 13, 2022

  1. introduce --merge to bring up merge editor (for #5770)

    @bpasero
    bpasero committed Jul 13, 2022
    Configuration menu
    Copy the full SHA
    3a81e42 View commit details
    Browse the repository at this point in the history

  2. wait on proper editor when merging

    @bpasero
    bpasero committed Jul 13, 2022
    Configuration menu
    Copy the full SHA
    ce6cded View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into ben/distinct-manatee

    @bpasero
    bpasero authored Jul 13, 2022
    Configuration menu
    Copy the full SHA
    b51b3f5 View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2022

  1. Merge branch 'main' into ben/distinct-manatee

    @bpasero
    bpasero authored Jul 14, 2022
    Configuration menu
    Copy the full SHA
    cc0f7ed View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2022

  1. sqlite slowness

    @bpasero
    bpasero committed Jul 15, 2022
    Configuration menu
    Copy the full SHA
    a0b4291 View commit details
    Browse the repository at this point in the history

  2. disable flush on write in tests unless disk tests

    @bpasero
    bpasero committed Jul 15, 2022
    Configuration menu
    Copy the full SHA
    361041a View commit details
    Browse the repository at this point in the history

  3. more runWithFakedTimers

    @bpasero
    bpasero committed Jul 15, 2022
    Configuration menu
    Copy the full SHA
    bc3bdf8 View commit details
    Browse the repository at this point in the history

  4. disable flush also in pfs

    @bpasero
    bpasero committed Jul 15, 2022
    Configuration menu
    Copy the full SHA
    bbb71bf View commit details
    Browse the repository at this point in the history

  5. Merge branch 'main' into ben/distinct-manatee

    @bpasero
    bpasero authored Jul 15, 2022
    Configuration menu
    Copy the full SHA
    fe155ae View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2022

  1. Merge branch 'main' into ben/distinct-manatee

    @bpasero
    bpasero authored Jul 16, 2022
    Configuration menu
    Copy the full SHA
    9d5d25f View commit details
    Browse the repository at this point in the history

  2. introduce IResourceMergeEditorInput

    @bpasero
    bpasero committed Jul 16, 2022
    Configuration menu
    Copy the full SHA
    45d42f1 View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2022

  1. cleanup

    @bpasero
    bpasero committed Jul 17, 2022
    Configuration menu
    Copy the full SHA
    6b77b3c View commit details
    Browse the repository at this point in the history

  2. align with merge editor names

    @bpasero
    bpasero committed Jul 17, 2022
    Configuration menu
    Copy the full SHA
    399737e View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2022

  1. Merge branch 'main' into ben/distinct-manatee

    @bpasero
    bpasero authored Jul 18, 2022
    Configuration menu
    Copy the full SHA
    d6452a3 View commit details
    Browse the repository at this point in the history

  2. stronger check

    @bpasero
    bpasero committed Jul 18, 2022
    Configuration menu
    Copy the full SHA
    1d9c4e8 View commit details
    Browse the repository at this point in the history

  3. adopt ResourceSet

    @bpasero
    bpasero committed Jul 18, 2022
    Configuration menu
    Copy the full SHA
    640009e View commit details
    Browse the repository at this point in the history

  4. no need to coalesce

    @bpasero
    bpasero committed Jul 18, 2022
    Configuration menu
    Copy the full SHA
    abe9324 View commit details
    Browse the repository at this point in the history

  5. improve matches method

    @bpasero
    bpasero committed Jul 18, 2022
    Configuration menu
    Copy the full SHA
    972decd View commit details
    Browse the repository at this point in the history

  6. fix tests

    @bpasero
    bpasero committed Jul 18, 2022
    Configuration menu
    Copy the full SHA
    9aec108 View commit details
    Browse the repository at this point in the history