Aditya Sridhar
Sep 8, 2018 · 1 min read

That’s the second approach I have mentioned :). The developer should resolve the conflicts even before raising the pull request. But the only thing is if the developer is a beginner , then the developer would find it difficult to resolve the conflicts so in that case the Lead would need to do it. With Experience the developer would be able to resolve the conflicts and then can follow the second approach :).

    Aditya Sridhar

    Written by

    I love Technology and Like to Help Others with any knowledge that I have. My Website: https://adityasridhar.com/