culTest

    One of the 25 questions in this topic

    How much do you know about Git & GitHub: Branches and Collaboration?

    When does a merge conflict happen?

    Answers

    When two people work on different files.
    When there are incompatible changes on the same line of the same file in the branches being merged.Correct
    When the GitHub server goes down.
    When you try to commit without a message.

    Git cannot decide automatically which change is correct and requires human intervention.

    View all questions with answers