merge conflict in bitbucket

[Ganeshkumar k]

can you share me the steps to resolve mail configuration for merge conflict in bitbucket or onestash

[mathagician]

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 <<<<<<<<, ========, >>>>>>>>.