not something we can merge

git checkout branch-name
git checkout master
git merge branch-name

git is pushing with an unexpected user/email

According to the github docs, GitHub uses the email address set in your local Git configuration to associate commits pushed from the command line with your GitHub account. * Check values from

git config -l

• Check

git config --global -l

• Check Check host from

vim ~/.ssh/config

and compare it with the one in the repo push/fetch url at

.git/config