4a0758045c
I did this manually first, but came up with a much better way that produced a slightly better result (verified the diffs against the next branch). Sequence of commands: # Checkout the last good commit (right before the first bad merge) git checkout aa76e8b6fc8515bfc65d4b75456b74c26ee32f1e^ # Reset the HEAD pointer to the last bad merge, but not the worktree git reset 3c197891b50d9ac5e5016f55551b6dff82f62f33 # Update the index git add -A # Apply all the changes that mattered between the above to commits git cherry-pick -n 29cb19b774b6e0cb73851feb6877da5e42bba78e git cherry-pick -n 0e9d107fcfbd3421b7988a4252a9965896019aba git cherry-pick -n f19496887beb974c3bc9df9a57f6214a696417b1 git cherry-pick -n 939e2b253b798386ce53954626fd8044ecb18db6 git cherry-pick -n 02f07b5d5994b8345ebc86546e5f66524ac04dac # Commit the changes git commit # Rebase the diffs on top of the latest nyc-dev-plus-aosp, since some # changes have been manually applied, there will be a few merge # conflicts git rebase goog/nyc-dev-plus-aosp All the SHA-1s above were discovered using a combination of this command to find the changes actually submitted into nyc-dev-plus-aosp itself: git log --oneline --first-parent goog/nyc-dev-plus-aosp and then to find the original commits (that weren't marked as DO NOT MERGE ANYWHERE): git log --oneline --no-merges --stat aa76e8b..goog/nyc-dev-plus-aosp Change-Id: Iec12619678cb8d011d2c6df26a34ce26e042b854