Hello Ganesh Kumar,
Merge conflict is a situation that comes when git is not able to decide which piece of the code/data to be used since the last change was made to a file.
In your code, you see
<<<<<<<<
<code before>
...............
=========
<code after>
................
>>>>>>>>>
you need to decide after carefully seeing the code between <code before> and <code after> and remove the delimiters <<<<<<<<, ========, >>>>>>>>.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.