Git operations

Neo can help you out with git operations to do with your coding. Just ask Neo on a pull request or work item comment. e.g. “@neo cherry pick commit 123efg456”.

Neo can carry out the following actions.

  • Revert any commit

  • Cherry pick any commit

  • Rebase against another branch

  • Create a branch

  • Delete a branch

Rebasing

Rebasing involves irreversibly force pushing, so Neo makes a backup tag before it begins. It will say “I tagged the original branch with neo-rebase-backup-” to let you know the tag, in case you need it.

If you want to go back to that version, you will need to locally check out the branch, reset to it, and force push.

git checkout <branchname>
git reset --hard neo-rebase-backup-<checksum>
git push -f

Be careful with force pushing, as this can overwrite changes somebody else has made meanwhile. Only do this on branches you’re fully in control of.