How does Git handle conflicts when merging two branches with changes to the same line of code?
- Automatic Merge
- Branch Deactivation
- Manual Resolution
- Priority Given to Latest Commit
Git handles conflicts by marking them, and it's the developer's responsibility to resolve them manually. This ensures that the developer reviews and approves the changes, preventing unintended modifications.
Loading...
Related Quiz
- What does HTML stand for?
- In a project, you need to embed a YouTube video. Which HTML element would you use for this purpose?
- Your application requires flexible schemas and the ability to store hierarchical data. Which NoSQL database would you recommend and why?
- MongoDB stores data in _______ format.
- TDD promotes writing _______ that fail before writing new code to pass them.