Merge Conflict Issue Confusion

Do I have to accept every incoming change? I will remove every code of last module.

No, we have to keep the earlier code. In cases where we require both the incoming & the current changes, select both & then edit the code as required.

When I select both, then lot of undefined errors started showing.

You may have to deal with things like proper bracketing

No, you have to think accordingly. Because in evere git pull they have given few changes not all and it’s easily recognizable by todos. They have mentioned task module name on each todo.

Thanks !! solved it.

@ajraj27 in each and every pull the incoming changes are blank functions