# Pastebin 69gKigMK Make a backup of the directory first, just in case: cp -a octavia octavia.bak Make sure your patch is on a branch: git status, if not do a git checkout -b data-model git checkout master git remote update git pull git checkout data-model git rebase --onto eb27359cd25a05f0d50d302e39fdab14e2b23f1d 548b6ed521dcce899c79d1a1f36617029c05f819 git review