search

jimsky7 / CyberSpark.net

jimsky7
http://cyberspark.net/
6 stars 0 forks source link

Can't merge #4

Closed jimsky7 closed 11 years ago

jimsky7 commented 11 years ago

Currently working on understanding how to "merge" the Development branch back into Master. I can do it on the github software on the Mac, but after I "sync" it doesn't appear in github.com. The merge works fine locally on the Mac, just doesn't go to github.com.

Working on this now.

jimsky7 commented 11 years ago

Understood. Github client for Mac had to be messed with, and after some futzing it works now. I have no idea what cleaned it up.