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 -
There are probably some commands to resolve it, but I would start by looking in your .git/config file for references to that branch, and removing them.