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

Python learns to detect conflicts and rebase #420

Draft
wants to merge 5 commits into
base: main
Choose a base branch
from
Draft

Python learns to detect conflicts and rebase #420

wants to merge 5 commits into from

Commits on Nov 29, 2024

  1. Python learns to rebase

    @mpiannucci
    mpiannucci committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    d4ebe07 View commit details
    Browse the repository at this point in the history

  2. fmt

    @mpiannucci
    mpiannucci committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    66ec6da View commit details
    Browse the repository at this point in the history

  3. fmt

    @mpiannucci
    mpiannucci committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    471bdfa View commit details
    Browse the repository at this point in the history

  4. Add conflict detector, need to figure out union mapping

    @mpiannucci
    mpiannucci committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    c6b3611 View commit details
    Browse the repository at this point in the history

  5. Add conflict detector impl

    @mpiannucci
    mpiannucci committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    1f8975b View commit details
    Browse the repository at this point in the history