I want to upload my first challenge to the repository, I do it through git, in this I use the branch named “sofita” when performing the MR, a conflict appears with this branch, when I sent the MR. and I hope the approval is rejected and they tell me that the MR should only be sent when the branch has finished integrating successfully (green), with this I understand that such a conflict is due to the branch, see image1
to solve this, verify that in git my branch is well created and it has been worked from it, and it is correctly, see image 2
I need help in knowing how to solve this conflict so that my MR is approved!
imagen1|690x195
