culTest

    One of the 100 questions in this topic

    How much do you know about Git and Version Control?

    What is a conflict when merging branches?

    Answers

    When two people edit the same line of codeCorrect
    A warning
    An error in the file
    A change that cannot be applied

    A conflict occurs when two branches have made changes to the same part of the code.