When resolving a merge conflict, changes from the incoming branch are marked with <<<<<<< followed by the branch name or a unique ________.

  • commit ID
  • conflict marker
  • timestamp
  • commit message
In Git, the <<<<<<< is a conflict marker indicating the start of changes from the incoming branch. It helps identify the conflicting changes and where they occur in the code.
Add your answer
Loading...

Leave a comment

Your email address will not be published. Required fields are marked *