Error during backmerge even no conflicts on branches

[PrzemyslawRodzik]

Hi,
I am currently working on automated version generation for my gitlab project.
My workflow is as follows:

master -> release branch -> the appropriate version is generated when a new commit is added
dev -> the place where the feature branches are marged into
prelease branch -> branch created from dev branch. This branch generates prerelease versions, such as 1.12-prelease.1, etc.

Semantic-release (the versioning part) is run for:

-> master branch when a new commit is added to this branch, usually when the prerelease branch is merged into master,
-> prerelease branch when a new commit is added to this branch.

Everything works fine.

Semantic-release (the part related to the backmerge) is called:

-> after new commit is added to the master branch,
-> after new commit is added to the prerelease branch.

Everything is successful only if the dev branch does not contain a new commit, ie one that does not exist in the prerelease or master branch. In my case, this situation will often take place, because the prerelease branch will be merged into master after 24 hours (until then, new changes may be added to the dev branch, which are not yet supposed to be sent to the master branch.

I would like to ask for a help as I do not understand the error that occurs . After the description of the error, I concludes that it is not a branch conflict bug. Moreover, when I tried to merge master branch into dev manually, everything ends up successfully without any conflicts. Below I share the semantic-release config and error from gitlab runner.

[mehdihadeli]

I have same issue with latest version

[alisson276]

I had the same issue with our Gitlab. When the Gitlab runner clones the repo, the main (and develop) are not tracked (HEAD detached). That means when this runs, it actually creates a new branch called main. Then it does the same for develop. This happens because of the -B flag (https://github.com/saitho/semantic-release-backmerge/blob/master/src/helpers/git.ts#L134) when switching to the new branch.

I don't know why this -B was added (I believe the branch is supposed to exist). I tested in a modified version without -B and everything works as expected, I mean, no commit from develop is lost.