resolve Conflicts in github

[rounakdey6]

can i resolve the conflicts in Github ?
and can you please tell me which to select ?

[aditya-bhaumik]

@rounakdey6 first press on resolve conflicts

[aditya-bhaumik]

now what you have to do is you need to check which code among the two codes are duplicates or if both the codes are needed together

[aditya-bhaumik]

after you are done with this you just have to remove the markers which will be like

---

or ============

[aditya-bhaumik]

after doing this the mark as resolved option will get enabled at top

[aditya-bhaumik]

mark as resolved and the commit changes

[rounakdey6]

Thank you

[aditya-bhaumik]

@rounakdey6 if your issue is solved please mark the answer and close this discussion if your issue is solved