I created a branch called \'6796\', then I pushed it to remote, checked it out on another machine, made other edits, pushed it, then merged it with the master, and deleted it -
This error could be thrown in the following situation as well.
You want to checkout branch called feature from remote repository but the error is thrown because you already have branch called feature/ in your local repository.
Simply checkout the feature branch under a different name:
git checkout -b /feature