culTest

    One of the 25 questions in this topic

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

    In a conflict, what separates the current branch code, HEAD, from the code coming from the merge?

    Answers

    The <<<<<< marker
    The ======= markerCorrect
    The >>>>>> marker
    A blank space.

    The seven equal signs separate both versions inside the conflicted file.