Skip to content

Support nested conflicts aka git "temporary merge branches" #24

@yairchu

Description

@yairchu

See this question on stackoverflow for more information on the issue.

When I had this situation I created this branch which adds support for it, but I haven't encountered these in a while and would feel more comfortable merging this change in when I face the issue again.

Metadata

Metadata

Assignees

No one assigned

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions