Q & A by Maninder Singh

Question:

QUESTION: How do you merge branches and resolve conflicts?

Answer:

Merging involves combining changes from one branch into another. Conflicts may occur when changes conflict with each other, and they need to be manually resolved.