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.
Loading...
Related Quiz
- After performing a rebase, you may need to use git ______ to incorporate the changes into the base branch.
- What is the effect of git reset --hard HEAD^?
- In terms of secure Git practices, what is the significance of signed commits?
- How do branch protection rules contribute to repository security?
- In a distributed version control system like Git, each contributor has a local copy of the ________.