Skip to content

Explain better when a merge conflict will appear #163

@AnnikaLau

Description

@AnnikaLau

It was not clear to everyone when exactly Git would issue a merge conflict. This could explained more clearly.

Metadata

Metadata

Assignees

No one assigned

    Labels

    beginnerRelevant for Beginner's course

    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