DEV Community


Discussion on: How to use git efficiently

theluk profile image
Lukas Klinzing

Good post, thank you!

Generally I disagree that the reviewer should solve conflicts. I had to do that and it's the hardest thing on planet when you have not written the actual code.

Conflicts happen when two or more people work in the same sphere. They should be able to handle it. The reviewer should only review the code that works.

karlkras profile image
Karl Krasnowsky

100% agree. Why should the reviewer be tasked with resolving the conflicts?

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 :)