Question

What is the process of resolving conflicts in Git?

Answer 1

This question is one of the prominent entrants among top Git interview questions. Candidates could expect this question alongside questions regarding definitions of conflict in git like in the previous question. Here are the steps for resolving conflicts in Git.

• Recognize the files responsible for the conflict
• Implement necessary changes to the files for avoiding any possibilities of conflict
• Add the files by using the command “git add.”
• The final step involves committing the changed file through the command “git commit.”