Git Get Remote Sha: $ git fetch origin <sha> Git Octopus merge staging: Make sure the staging area is how you want the commit to be $ git write-tree <staging sha> $ git commit-tree <staging sha> -p <parent1> -p <parent2> .... -m "Message" <commit sha> $ git reset --hard <commit sha>