When resolving conflicts in Git, the modified files must be _______ before committing.
- Committed
- Merged
- Reverted
- Staged
When resolving conflicts in Git, the modified files must be staged (using "git add") after resolving the conflict but before committing the changes. Staging indicates that the conflicts have been addressed and are ready to be included in the next commit.
Loading...
Related Quiz
- In a project, you have a table with millions of records, and your queries are taking too long to execute. What strategies would you employ to optimize the performance of the database?
- Which HTTP header is commonly used to control caching in a browser?
- Which caching strategy is suitable for reducing database load and improving response times for frequently accessed data?
- What is encapsulation in OOP?
- Your team has encountered a critical issue in the production environment after deploying the software. Outline the steps you would take to address this issue and prevent similar incidents in the future.