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(merge): avoid changing .bitmap version when using --theirs strategy #7080

Merged
merged 4 commits into from
Feb 23, 2023
Merged

fix(merge): avoid changing .bitmap version when using --theirs strategy #7080

merged 4 commits into from
Feb 23, 2023

Commits on Feb 22, 2023

  1. fix(merge): avoid changing .bitmap version when using --theirs strategy

    @davidfirst
    davidfirst committed Feb 22, 2023
    Configuration menu
    Copy the full SHA
    8a11edf View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2023

  1. Merge branch 'master' into checkout-version-theirs

    @davidfirst
    davidfirst committed Feb 23, 2023
    Configuration menu
    Copy the full SHA
    3bea2eb View commit details
    Browse the repository at this point in the history

  2. fix tests

    @davidfirst
    davidfirst committed Feb 23, 2023
    Configuration menu
    Copy the full SHA
    66453f4 View commit details
    Browse the repository at this point in the history

  3. add docs

    @davidfirst
    davidfirst committed Feb 23, 2023
    Configuration menu
    Copy the full SHA
    0e176d1 View commit details
    Browse the repository at this point in the history