Thanks Niki and Chris. Now my ignorance of git will become obvious. I just ran the following commands:
git remote add nikis-github-repo https://github.com/nikgul/kicad-source-mirror.git git checkout -b stable-4 git pull nikis-github-repo 4.0.x and I'm getting conflicts on dozens files. This can't be right. WTF am I doing wrong? I just want to pull Niki's 4.0.x branch (which I want to rename stable-4) into my local repo and push it to lp:kicad. On 8/22/2016 10:40 PM, Chris Pavlina wrote: > Looks good to me. Wayne, I'd probably just pull from this if I were you. > > On Mon, Aug 22, 2016 at 11:26:31PM +0200, Niki Guldbrand wrote: >> Hi Wayne. >> >> I have pushed an updated 4.0.x branch to github, please have a look and >> see if you can use it as is, or ... ? >> >> >> On man, 2016-08-22 at 16:39 -0400, Wayne Stambaugh wrote: >>> I only need a snapshot of the current 4 stable branch r6308 tag >>> 4.0.4. >>> I'm the only one with commit access so I can guarantee it wont >>> change. >>> If you update your stable 4 branch, I'll pull this into my repo and >>> then >>> push it to the kicad repo as the stable 4 branch and then make the >>> bzr >>> stable 4 repo read only. The help would be greatly appreciated. >>> >>> Thanks, >>> >>> Wayne >>> >>> On 8/22/2016 2:12 PM, Niki Guldbrand wrote: >>>> >>>> Hi All. >>>> >>>> I Have a copy of 4.0.x in my git repo at github [1], although I >>>> havent >>>> updated it in som time, but the setup is still there, I just need >>>> to >>>> install the git bzr plugin again, and I can keep it updated for >>>> some >>>> time if you wish ? >>>> >>>> I also have an suggestion, that you might want to adopt the git >>>> flow >>>> development model, the github repo i [1] is setup for that, with >>>> the >>>> develop, and feature branches. >>>> It currently contains 2 feature branches I was considering sending >>>> patches in for. >>>> >>>> [1] https://github.com/nikgul/kicad-source-mirror >> >> -- >> Niki Guldbrand <[email protected]> >> >> _______________________________________________ >> Mailing list: https://launchpad.net/~kicad-developers >> Post to : [email protected] >> Unsubscribe : https://launchpad.net/~kicad-developers >> More help : https://help.launchpad.net/ListHelp _______________________________________________ Mailing list: https://launchpad.net/~kicad-developers Post to : [email protected] Unsubscribe : https://launchpad.net/~kicad-developers More help : https://help.launchpad.net/ListHelp
