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

rebaseconflict: initial step to support check-in conflict #77

Closed
wants to merge 3 commits into from
Closed

rebaseconflict: initial step to support check-in conflict #77

wants to merge 3 commits into from

Commits on Mar 16, 2021

  1. conflict: new crate for handling stacked conflicts 

    Summary:
Main idea (use `(adds, removes)` two list to represent conflicts) comes from
https://github.com/martinvonz/jj. I still need to think about octopus merge,
but for regular 3-way merges or stacked 3-way merges I think I understand how
it works.

This diff defines the data model with some simple operations on them.

Differential Revision: D26949661

fbshipit-source-id: 4ed0316802629084ce75349df2bbcc276af57387
    @quark-zju @facebook-github-bot
    quark-zju authored and facebook-github-bot committed Mar 16, 2021
    Configuration menu
    Copy the full SHA
    6967c7b View commit details
    Browse the repository at this point in the history

  2. pyconflict: bindings for the conflict module 

    Summary: Expose the Rust conflict module to Python.

Differential Revision: D26949660

fbshipit-source-id: fc85e6e4d448746084cb8ce655b85cbbb9c1429d
    @quark-zju @facebook-github-bot
    quark-zju authored and facebook-github-bot committed Mar 16, 2021
    Configuration menu
    Copy the full SHA
    0d17f20 View commit details
    Browse the repository at this point in the history

  3. rebaseconflict: initial step to support check-in conflict 

    Summary:
Lots of things are missing compared to the regular rebase, ex:
- Rebasing multiple commits.
- Respecting the mutation markers.
- Rebasing merges.
- Automatic 3-way merges on conflicted files.
- Support from other commands like update, resolve.

But this demonstrates the basic concept.

Differential Revision: D26949659

fbshipit-source-id: f37528554f5352ced351f619e86bfe124f803933
    @quark-zju @facebook-github-bot
    quark-zju authored and facebook-github-bot committed Mar 16, 2021
    Configuration menu
    Copy the full SHA
    eacda70 View commit details
    Browse the repository at this point in the history