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: push autoresolved merge conflict on backend automatically #13544

Merged
merged 4 commits into from
Sep 26, 2024
Merged

fix: push autoresolved merge conflict on backend automatically #13544

merged 4 commits into from
Sep 26, 2024

Commits on Sep 16, 2024

  1. Handle non-fastforward case automatically on backend, send filesync t… 

    …o frontend
    @Jondyr
    Jondyr committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    01c306f View commit details
    Browse the repository at this point in the history

  2. Change integration test to gitea to check for actual conflicts

    @Jondyr
    Jondyr committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    7410f1a View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2024

  1. Merge branch 'main' into fix/resolve-deadlock-on-git-push-with-fastfo… 

    …rward
    @Jondyr
    Jondyr authored Sep 23, 2024
    Configuration menu
    Copy the full SHA
    4c6a157 View commit details
    Browse the repository at this point in the history

  2. Update RepositoryControllerGiteaIntegrationTests.cs

    @Jondyr
    Jondyr authored Sep 23, 2024
    Configuration menu
    Copy the full SHA
    ef760eb View commit details
    Browse the repository at this point in the history