Merge Conflict Hint needed

During Merge Conflict how should I judge it
whether I have to make current changes || incoming || both the changes ?

still confuse in it

Hi! @hrithik_cr7

Its require basic understanding.
If incoming code has empty function and same function is already written by you .
Then accept current changes .

If it replacing something you didn’t wrote and is adding new member function or ToDo tasks .
Then accept incoming changes.

In case you have written something and and new function is adding or TODOS are adding
Accept both .

Its just a common sense you will realise what to retain and what to add.

1 Like

this was so helping thankyou for solving my doubt :slight_smile:

Closing this topic as your issue is resolved by the mentor. If it is still not resolved, Kindly un-mark the accepted solution or create a new topic and post this question as a reference link in the description of the new topic.