try octopus merge strategy

diff --git a/branch_merger.sh b/branch_merger.sh
index ba4b8f447cedd3d7b3128454b4191d3e29452048..d01fb174b4e9c83ddac4f1bc84c168b2a6a2bb43 100755 (executable)
--- a/branch_merger.sh
+++ b/branch_merger.sh
@@ -2,7 +2,9 @@
 set -e
 
 # first, in this branch, rebase against master.
+git checkout libresoc-merger
 git rebase master
 
 # now rebase the "display" branch onto the "fork" branch
-git rebase --onto libresoc-nmigen-fork master display-patch
+git checkout libresoc-nmigen-fork
+git merge -s octopus display-patch libresoc-merger