How to resolve conflicts in other people's pull requests?

Question

git

I work in a company, one employee left the company, and the team leader asked to resolve conflicts in a task that was not filled in by that same employee. Question: how can I resolve the conflict if I did not write the code, and I have a vague understanding of what should have happened in its task?

Answer 1

Without understanding the project, the essence of the tasks and other things - nothing.
We need to understand the project first.
Timlid needs to be explained that you do not understand the essence of the changes made.
If the team leader has a head, then he will understand. Too big risks.
Therefore, for each conflict you do not understand, contact the team leader and ask him questions - why was this changed to that? Yes, it will get him and he will understand that the task is beyond your power.