zdiff: Add merge strategy to bypass conflicts caused by branding

Signed-off-by: notcarbide <luis@0k.cx>
uzap · Apr 1, 2022 · cad2771 · cad2771
1 parent 0caffd7
commit cad2771
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/zap/zdiff.sh b/zap/zdiff.sh
@@ -4,7 +4,7 @@ BRANCH=stable
 REF=rpi/rpi-5.15.y
 
 git checkout $REF
-git merge --no-ff --no-edit $BRANCH
+git merge -s ours --no-ff --no-edit $BRANCH
 
 git log --oneline HEAD^..HEAD > zap/changes.log
 sed -i '1d' zap/changes.log