[1297] Use git rebase to get to latest commit