We're updating the issue view to help you get more done. 

Merging a release branch into master sometimes causes merge conflicts

Description

When performing an automated release with the ReleaseProcessScript, the automatic merge from release into master is not supposed to cause merge conflicts and should instead always choose the "choose theirs" strategy to resolve conflicts automatically. In the following scenario, it was reproduced to not be the case:

  • Create a release branch from develop, perform commits on it and merge it into master

  • Do the same step with a different release branch and different commits, the user is in certain cases which are to be investigated prompted to release the merge conflicts themself

Assignee

Unassigned

Reporter

Stefan Ilic

Labels

None

Components

Fix versions

Affects versions

Priority

Normal
Configure