Skip to content

Consider the cases that a merge scenario has more than one base commit #110

Description

@rafaelmotaalves

This can happen in cases like the one described at
https://stackoverflow.com/questions/26370185/how-do-criss-cross-merges-arise-in-git

This documentation explains how the git handles those cases:
https://git-scm.com/docs/merge-strategies/2.14.6

Activity

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

No one assigned

    Labels

    bugSomething isn't working

    Type

    No type

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions