When a merge conflict occurs, which section of the conflict markers indicates the changes from the current branch?
- <<<<<<< HEAD
- =======
- >>>>>>> branch-name
- <<<<<<< branch-name
The section <<<<<<< HEAD indicates the changes from the current branch in a merge conflict. Developers should edit the content between this marker and ======= to resolve conflicts manually.
Loading...
Related Quiz
- In a project with multiple contributors, two developers have made different changes to the same file. What Git feature will help resolve this when merging?
- A developer is working on a feature in a separate branch and needs to incorporate updates made in the main branch. What Git process should they use?
- Using SSH ________ is a recommended method for secure authentication in Git.
- In Git, the __________ file can be used to enforce code quality standards across all project contributors.
- How can you create an annotated tag in Git that includes a message?