+ [2016-10-17T23:44:29Z] matkatmusic 506 people, and everyone is silent :-/
+ [2016-10-17T23:46:38Z] allejo downloading the zip file won't give you a copy of the git history
+ [2016-10-17T23:47:36Z] allejo what you would have to do is clone the repo into a separate location on your machine and then copy your changes into that cloned version. from your cloned version, you'll be able to create and commit and/or branch and push it back to github
+ [2016-10-17T23:48:23Z] allejo also, this isn't an official support channel so all of us are just hanging around willing to help if we can. we don't always have IRC open :)
+ [2016-10-17T23:50:22Z] allejo https://guides.github.com/

message no. 153574

Posted by m_ben in #github at 2016-10-17T12:39:07Z

I have the following issue: I forked a repo, made some changes to the master branch (I forgot to open a new feature branch) and pushed it to my forked github repo, then I opened a pull request. Now the original author asked me to resolve the conflicts with his new updated master. what is the best way to do that? sorry, I'm not very well experienced with github. I googled but everyone suggests to do all
+ [2016-10-18T00:14:49Z] matkatmusic i've cloned the repo via XCode's "Check Out"
+ [2016-10-18T00:15:18Z] ryoshu I just noted https://github.com/PixarAnimationStudios
+ [2016-10-18T00:15:27Z] ryoshu working on NetBSD port now
+ [2016-10-18T00:20:38Z] matkatmusic So, i need to manually copy over my source files into this cloned version?