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

Minor fixes for Resolve Conflict #1037

Merged
merged 4 commits into from
Nov 6, 2023
Merged

Minor fixes for Resolve Conflict #1037

merged 4 commits into from
Nov 6, 2023

Commits on Oct 31, 2023

  1. Fixes: it should not resolve if resolve flag is not true

    @sadiqkhoja
    sadiqkhoja committed Oct 31, 2023
    Configuration menu
    Copy the full SHA
    42d3ab6 View commit details
    Browse the repository at this point in the history

  2. Fixes: set updatedAt on resolve conflict

    @sadiqkhoja
    sadiqkhoja committed Oct 31, 2023
    Configuration menu
    Copy the full SHA
    2b4a807 View commit details
    Browse the repository at this point in the history

  3. Check for If-Match before resolve conflict

    @sadiqkhoja
    sadiqkhoja committed Oct 31, 2023
    Configuration menu
    Copy the full SHA
    673d200 View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2023

  1. changed the title of the test

    @sadiqkhoja
    sadiqkhoja committed Nov 6, 2023
    Configuration menu
    Copy the full SHA
    3b75532 View commit details
    Browse the repository at this point in the history