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

Create a test for rebaseBranch (with a basic conflict) #989

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Create a test for rebaseBranch (with a basic conflict) #989

wants to merge 4 commits into from

Commits on Apr 13, 2024

  1. Create rebaseBranch tests and move resolveConflictsWithResolver m… 

    …ethod into GCLiveRepository category
    @lapfelix
    lapfelix committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    22f999b View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2024

  1. Reorganize rebase tests to include a simple rebase, one with conflict… 

    … and one with multiple commits and conflicts (the last one fails with the current version)
    @lapfelix
    lapfelix committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    35b083d View commit details
    Browse the repository at this point in the history

  2. Add GCLiveRepository+Conflicts.m to the iOS GitUpKit target

    @lapfelix
    lapfelix committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    a51c5de View commit details
    Browse the repository at this point in the history

  3. Fix release compilation by making GCLiveRepository+Conflicts.h public

    @lapfelix
    lapfelix committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    e70784b View commit details
    Browse the repository at this point in the history