-
Cyril 'kibi' Brulebois authored
The release manager might have made sure their release checkout has an updated release branch (e.g. stable) when starting the release process, but other local branches might be lagging behind. To make possible conflicts easier to spot/solve, ensure one catches up with the destination branch on the remote before trying to merge the source branch into it.
f7970ac6