latest 19 messages by matkatmusic

+ [8 years ago] matkatmusic So, I need to put my non-master branch in Folder A of the project into the Folder B version
+ [8 years ago] 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
+ [8 years ago] matkatmusic I did some branching and whatnot with this version in Folder A
+ [8 years ago] 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.
+ [8 years ago] matkatmusic i'm taking another crack at this merging of two repos
+ [8 years ago] matkatmusic and then when i'm ready, push the branch?
+ [8 years ago] matkatmusic So, i need to manually copy over my source files into this cloned version?
+ [8 years ago] matkatmusic i've cloned the repo via XCode's "Check Out"
+ [8 years ago] matkatmusic 506 people, and everyone is silent :-/
+ [8 years ago] matkatmusic (this is what I get for not checking out from the online repo directly via xcode)
+ [8 years ago] matkatmusic well, how about copying the branch from my modified version into the master branch i just checked out from the online repo
+ [8 years ago] matkatmusic but now i'm needing to upload my changes so that they appear as a branch on the remote repo
+ [8 years ago] 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.