How does Git handle merge conflicts, and how can they be resolved?
- Automatically resolves conflicts
- Ignoring conflicts
- Manual resolution by the user
- Reverting to a previous commit
Git handles merge conflicts by marking them in the code and prompting the user for manual resolution. This involves reviewing the conflicting changes, choosing the correct versions, and then committing the resolved files back into the repository.
Loading...
Related Quiz
- What is the time complexity of inserting a node at the end of a singly linked list?
- What is ACID compliance, and why is it less emphasized in NoSQL databases compared to relational databases?
- You're working on a banking system where financial transactions need to be securely stored and retrieved. How would you design the database schema and implement transaction management in this scenario?
- What is the difference between == and === in JavaScript?
- What is the function of an inode in a Unix-like file system?