DEV Community


Discussion on: How to use git efficiently

adityasridhar profile image
Aditya Sridhar Author

Ideal approach is the developers resolve the conflict themselves :).

But that said, if a developer is a beginner, then they will find it hard to resolve conflicts. So in that case the tech lead can resolve the conflicts. With more experience the developer will be able to resolve the conflicts by themselves :)