#git

How to Solve Squash Failed on GitLab

So I'm trying to merge one of the major features with lots of changes and merge conflicts then suddenly came out with this error: Squashing Failed: Squash the commits locally, resolve any conflicts, then push the branch. Try again. It's happened to ...