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

feat: improved merge conflict solver #139

Merged
merged 28 commits into from
Oct 2, 2024
Merged

feat: improved merge conflict solver #139

merged 28 commits into from
Oct 2, 2024

Commits on Sep 4, 2024

  1. work

    @Katajisto
    Katajisto committed Sep 4, 2024
    Configuration menu
    Copy the full SHA
    2b6f3b6 View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2024

  1. feat: add diff utilities

    @michal-futurice @Katajisto
    michal-futurice authored and Katajisto committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    68101b1 View commit details
    Browse the repository at this point in the history

  2. fix: improve diff tests

    @michal-futurice @Katajisto
    michal-futurice authored and Katajisto committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    e828ca8 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'temp/merge-michal' into feat/merge-conflict-solver

    @Katajisto
    Katajisto committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    97a8b46 View commit details
    Browse the repository at this point in the history

  4. feat: add function to calculate unified diff conflict start line indices

    @michal-futurice @Katajisto
    michal-futurice authored and Katajisto committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    e4d27a8 View commit details
    Browse the repository at this point in the history

  5. work on better ui

    @Katajisto
    Katajisto committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    7679cfa View commit details
    Browse the repository at this point in the history

  6. Merge branch 'temp/merge-michal' into feat/merge-conflict-solver

    @Katajisto
    Katajisto committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    06bfce4 View commit details
    Browse the repository at this point in the history

  7. refactor + improvements

    @Katajisto
    Katajisto committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    4e6d282 View commit details
    Browse the repository at this point in the history

  8. fix: remove todo

    @Katajisto
    Katajisto committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    3e29cc4 View commit details
    Browse the repository at this point in the history

  9. fix: fix issue with first line visibility and footer percent border

    @Katajisto
    Katajisto committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    5411211 View commit details
    Browse the repository at this point in the history

  10. fix: lint issue with constant types

    @Katajisto
    Katajisto committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    2056564 View commit details
    Browse the repository at this point in the history

  11. fix: stop doing -1 to conflict diff line numbers

    @Katajisto
    Katajisto committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    b59856c View commit details
    Browse the repository at this point in the history

  12. fix: make all of the result strings present tense

    @Katajisto
    Katajisto committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    4ff1af6 View commit details
    Browse the repository at this point in the history

  13. fix: unify viewport height calculation

    @Katajisto
    Katajisto committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    7779ecd View commit details
    Browse the repository at this point in the history

  14. feat: colorize diff display content and add end of file marker

    @Katajisto
    Katajisto committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    43bc5dd View commit details
    Browse the repository at this point in the history

  15. feat: better diff navigation

    @Katajisto
    Katajisto committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    cda5915 View commit details
    Browse the repository at this point in the history

  16. lint: remove redundant break statements

    @Katajisto
    Katajisto committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    f43ee97 View commit details
    Browse the repository at this point in the history

  17. fix: typo in conflict resolution

    @Katajisto
    Katajisto committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    2b32593 View commit details
    Browse the repository at this point in the history

  18. fix: tests

    @Katajisto
    Katajisto committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    c0c8030 View commit details
    Browse the repository at this point in the history

  19. fix: update tests to reflect the current ui

    @Katajisto
    Katajisto committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    bebb8d7 View commit details
    Browse the repository at this point in the history

  20. chore: change colors, refactor a bit and change to keep old

    @Katajisto
    Katajisto committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    ecd8ac0 View commit details
    Browse the repository at this point in the history

  21. chore: make common colors publicly available

    @majori @Katajisto
    majori authored and Katajisto committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    82d0b67 View commit details
    Browse the repository at this point in the history

  22. chore: add yellow to common colors

    @majori @Katajisto
    majori authored and Katajisto committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    e253a64 View commit details
    Browse the repository at this point in the history

  23. chore: fix typo in variable name

    @michal-futurice @Katajisto
    michal-futurice authored and Katajisto committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    4d2e1a1 View commit details
    Browse the repository at this point in the history

  24. chore: switch to using embed package for test data reading

    @michal-futurice @Katajisto
    michal-futurice authored and Katajisto committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    03f0c68 View commit details
    Browse the repository at this point in the history

  25. chore: remove unnecessary star from testdata path

    @michal-futurice @Katajisto
    michal-futurice authored and Katajisto committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    55b11cf View commit details
    Browse the repository at this point in the history

  26. chore: make end of file marker gray

    @Katajisto
    Katajisto committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    5004486 View commit details
    Browse the repository at this point in the history

  27. chore: change gray into adaptive highlight color

    @Katajisto
    Katajisto committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    fc057e2 View commit details
    Browse the repository at this point in the history