Skip to content

sl import should have a flag to do 3-way merges #635

Description

@williewillus

Currently sl import in --partial mode only saves conflicting hunks to .rej files.

It would be great to have something similar to the -3 flag for git am, where the vcs will interactively pop up EDITOR to do 3-way merge resolution of any conflicts that come up when applying a patchset.

This would be similar to what happens if you rebase a stack that conflicts with new changes in trunk, so I don't think it'll be too hard to support. But would be really nice to have when working with patch files and not github.

Metadata

Metadata

Assignees

No one assigned

    Type

    No type
    No fields configured for issues without a type.

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions