Branch Merge?

[bhjuarez]

GitHub is saying that I committed a branch merge "Merge branch 'master' of github.com:phyloworks/CyPySci".

How did this happen? The only commands I ran was a git pull and git push.

Thanks

[wrightaprilm]

If you pulled and there were changes at remote that you did not have locally, the default behavior is to merge those changes with your repository.

[bhjuarez]

Simple enough.

I was able to run git commands (and anaconda/python!!) from the source tree terminal (however, I am using the version of git that comes with source tree), the newest version of git was not working with source tree although I had set the option to use the "system git" instead of the "embedded git"
I am on Windows 10.

I then had to play around ssh keys again and got git push to work through the terminal as well as through source tree. I had some difficulty with sourcetree, i would tell it what ssh key to use and at first it was not asking me for a password to the ssh when I started the program. Then it started asking for a password and I was getting an error even though the password I was typing was correct. Then it worked! I changed nothing!

[trayc7]

Thanks for this, Bryan. Tomorrow, we can look at your settings in sourcetree to see what you did for the SSH key.