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

Hediet/september #159654

Merged
merged 7 commits into from
Sep 5, 2022
Merged

Hediet/september #159654

merged 7 commits into from
Sep 5, 2022

Commits on Aug 28, 2022

  1. Implements result menu

    @hediet
    hediet committed Aug 28, 2022
    Configuration menu
    Copy the full SHA
    16536c2 View commit details
    Browse the repository at this point in the history

  2. Implements commands to recompute merge with git merge-file

    @hediet
    hediet committed Aug 28, 2022
    Configuration menu
    Copy the full SHA
    7688a40 View commit details
    Browse the repository at this point in the history

  3. Makes some merge editor dev commands available in browser

    @hediet
    hediet committed Aug 28, 2022
    Configuration menu
    Copy the full SHA
    2b53e15 View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2022

  1. Introduces mergeEditorMenus proposal & fixes issues from PR.

    @hediet
    hediet committed Sep 2, 2022
    Configuration menu
    Copy the full SHA
    6a853ed View commit details
    Browse the repository at this point in the history

  2. Extracts menu toolbar logic.

    @hediet
    hediet committed Sep 2, 2022
    Configuration menu
    Copy the full SHA
    e19f431 View commit details
    Browse the repository at this point in the history

  3. Fixes CI

    @hediet
    hediet committed Sep 2, 2022
    Configuration menu
    Copy the full SHA
    d9ffee4 View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2022

  1. Adresses feedback from PR

    @hediet
    hediet committed Sep 5, 2022
    Configuration menu
    Copy the full SHA
    226be69 View commit details
    Browse the repository at this point in the history