0

I created a Merge Request to merge my source branch (develop) to the target branch (master), with the "Squash commits" option checked. Everything was fine, but now, when I try to create the same Merge Request (merge develop -> master) I run into the problem, that now I have ALL my previous changes and commits (from the previous merge request) + new commits and changes in the NEW Merge Request. I know that squash creates new commit and it probably seems logical. But I've done the same things before and it worked fine.

hms5232
  • 323
  • 1
  • 6
Dmitriy Zhiganov
  • 1,060
  • 1
  • 5
  • 14
  • You need to update your `develop` branch (I'm assuming that you worked on the same branch that you merged with squash option). If it's not the case, please clarify in question how exactly your branches look like. – kadewu Jun 28 '22 at 08:29
  • In the end, I merged the new Merge Request with all these changes into the master branch, and everything seems to be fine. All of the previous changes were sort of "visual", that is, only visible in the mr, but not in the merge commit. I'm not sure what it was. – Dmitriy Zhiganov Jun 28 '22 at 11:52
  • Everything is not fine and the problem is not merely visual. A squash merge is not a merge, so if you try to do multiple squash merges from one branch into another, you get the behavior you've complained about. What you're doing is wrong and you need to stop doing it. – matt Jul 02 '22 at 13:41

0 Answers0