latest 19 messages by matkatmusic

+ [2016-10-18T07:09:01Z] matkatmusic So, I need to put my non-master branch in Folder A of the project into the Folder B version
+ [2016-10-18T07:08:18Z] matkatmusic then, another developer did edits to the master branch on Github, so I learned about using XCode's built-in integration with Git and "Check Out"ed that updated master branch. this version went into Folder B
+ [2016-10-18T07:07:17Z] matkatmusic I did some branching and whatnot with this version in Folder A
+ [2016-10-18T07:07:00Z] matkatmusic so, into folder A, i downloaded a zip of a repo on github and extracted, then I created a local git repo of it via command line.
+ [2016-10-18T07:06:13Z] matkatmusic i'm taking another crack at this merging of two repos
+ [2016-10-18T00:22:25Z] matkatmusic and then when i'm ready, push the branch?
+ [2016-10-18T00:20:38Z] matkatmusic So, i need to manually copy over my source files into this cloned version?
+ [2016-10-18T00:14:49Z] matkatmusic i've cloned the repo via XCode's "Check Out"
+ [2016-10-17T23:44:29Z] matkatmusic 506 people, and everyone is silent :-/
+ [2016-10-17T23:41:12Z] matkatmusic (this is what I get for not checking out from the online repo directly via xcode)
+ [2016-10-17T23:40:48Z] matkatmusic well, how about copying the branch from my modified version into the master branch i just checked out from the online repo
+ [2016-10-17T23:33:49Z] matkatmusic how do I go about doing this?
+ [2016-10-17T23:33:45Z] matkatmusic but now i'm needing to upload my changes so that they appear as a branch on the remote repo
+ [2016-10-17T23:33:10Z] matkatmusic i'm a new user and am working on a project for a client. I downloaded my source from github via the zipfile offered from the repository and set up a local git on my machine.