CODEWITHSUNDEEP
gitgitlabconflictmerge-request
Oupat
Oupat

Reputation: 107

Conflict in merge request in GitLab but no conflict on local

Hello,

I created a new branch from the 'develop' branch (I pulled before to be up-to-date with GitLab), I worked on my new branch then I pushed my new branch to GitLab.

Then I created a merge request from my new branch to 'develop' on GitLab.

Now, I can see there is a conflict in my merge request with a file I didn't modify.

I tried on local to merge the 'develop' branch in my new branch or to rebase my branch from 'develop', but I get everytime the same message than everything is up-to-date, what should I do to fix the issue in GitLab please?

Thanks

Upvotes: -1

Views: 66

Answers (1)

Oupat
Oupat

Reputation: 107

I found a solution, I rebased my branch not from develop but from origin/develop:

git rebase origin/develop

then I fixed conflicts and I pushed to my new branch:

git push --force

Upvotes: -1

Related Questions