Skip to content

Clearer idea of what to do with the conflicted merge #8

Open
Open
Clearer idea of what to do with the conflicted merge#8

Description

@pkgw
pkgw
opened on Jun 17, 2014

Emphasize the semantics of each branch before causing the conflict. Use "git log a..b" to show the differing commits.

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions