CODEWITHSUNDEEP
gitrebase
TechnoBeatsTamasha
TechnoBeatsTamasha

Reputation: 13

git merge request shows changes from another merge request

My merge request shows changes from another merge request and on gitlab I see target branch (master) is n commits behind. I tried git rebase master and also git pull --rebase. Still no change in above mentioned problem. Can someone please help?

Upvotes: 1

Views: 1864

Answers (1)

chevybow
chevybow

Reputation: 11958

Based on your comment I would recommend following this specific workflow

  • Go to your master branch and do a git pull
  • Switch back to your branch you are merging and do git rebase origin/master -i
  • Solve any conflicts that arise and fix any commits as needed
  • After the rebase is completed do a git push origin [your branch name] --force

This should solve your issue.

Upvotes: 1

Related Questions