The new, V4 Git Clone step was just released, which now includes the “manual merge” mode on “yes” by default, so this doesn’t have to be changed manually anymore.
The V4 of the step includes pretty much a 100% revision of the step’s code. We tried to keep everything backwards compatible (all inputs etc), with the exception of the “manual merge” mode which is enabled by default now. There’s still an option to turn it off and use the old GitHub specific “merge strategy” for PRs, but that should be avoided due to the related recent GitHub changes (more info in my comment above 
Invalid commit checked built on bitrise.io - #2 by viktorbenei ).
We tried our best to cover every edge case and keep the V4 version of the step backwards compatible, but if you’d have any issues please let us know!
Happy Building! 