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

remove --resolve-conflicts #473

Merged
merged 2 commits into from
Oct 30, 2023
Merged

remove --resolve-conflicts #473

merged 2 commits into from
Oct 30, 2023

Commits on Oct 29, 2023

  1. update git-fixtures

    Kelly Selden committed Oct 29, 2023
    Configuration menu
    Copy the full SHA
    5659744 View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2023

  1. remove --resolve-conflicts

    Kelly Selden committed Oct 30, 2023
    Configuration menu
    Copy the full SHA
    fbc545b View commit details
    Browse the repository at this point in the history