I created a merge conflict using git bash where I created a new branch and added new line to my introduction saying "i like c language for programming" ,then i created another branch named adi where i write "i like python language for programming". After that, I merged the temp branch with the adi branch it showed merge conflict because it get confused which statement is true ,the conflict is shown below:
then i opened the file name introduction where conflict occured it shows both the statement in
<< HEAD statement1 ====== statement2>>
from which we can easily distinguish the cause of conflict and edit it
i just deleted one of them and conflict is solved.
I created a merge conflict using git bash where I created a new branch and added new line to my introduction saying "i like c language for programming" ,then i created another branch named adi where i write "i like python language for programming". After that, I merged the temp branch with the adi branch it showed merge conflict because it get confused which statement is true ,the conflict is shown below:
then i opened the file name introduction where conflict occured it shows both the statement in
<< HEAD statement1 ====== statement2>>
from which we can easily distinguish the cause of conflict and edit it
i just deleted one of them and conflict is solved.
