From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Mon, 27 Sep 2021 17:06:52 +0000 (+0100)
Subject: try octopus merge strategy
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e7e709e14267520b146ce4f56333a58f7aa5893a;p=nmigen.git

try octopus merge strategy
---

diff --git a/branch_merger.sh b/branch_merger.sh
index ba4b8f4..d01fb17 100755
--- 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