If you are out of sync, you need to do the following. 1) From your dev machine, clone your fork. (You did this) 2) From that clone, add a second remote pointing to the official repo (assuming it's wix 3): < https://help.github.com/articles/configuring-a-remote-for-a-fork/ > git remote add upstream https://github.com/wixtoolset/wix3.git 3) Now you can fetch upstream changes to your dev machine. git fetch upstream 4) Assuming your develop branch is free of changes, then you should be able to do: git checkout develop git merge upstream/develop
Assuming all went well, you can now "git push develop" to push all the upstream changes to your fork. The workflow I use, and which aligns whit what you are hinting at. Create a feature branch off of develop. git checkout develop git checkout -b feat0001 <Do some work> <Add/Commit your changes> <Push your changes to origin (your fork)> <Submit a pull request from github> -----Original Message----- From: Phill Hogland [mailto:phogl...@rimage.com] Sent: Friday, November 14, 2014 3:47 PM To: wix-devs@lists.sourceforge.net Subject: [WiX-devs] [SPAM] 4592, but first github???? I have tried several times over the last year to figure out git on codeplex and more recently github work. Admittedly with other distractions maybe I did not try very hard. Over the years I have used VSS and SVN/Tortuous. So today I re-read the various git tutorials and played with my GithubInc installation. Several months ago I created a fork at : phillHgl/wix3 Today I figured out how to create a 'clone' of this fork. (Simple really, I don't know what I was stumbling over in the past.) I am not sure if this fork is up-to-date or if I need to do something. this link talks about doing 'git fetch upstream' https://help.github.com/articles/syncing-a-fork/ Is that my next step? Then from what I read I need to create a local branch (of my clone) specifically for working on bug 4592. Is that the right idea? I have been successful in the past at building debug versions of the wix source (using snapshot downloads). I have read about creating release build, but need to work through those steps also. My dev system has both VS2010 and VS2013 (but I use VS2013 and externally build using MSBuild) most of the time. -- View this message in context: http://windows-installer-xml-wix-toolset.687559.n2.nabble.com/4592-but-first-github-tp7597956.html Sent from the wix-devs mailing list archive at Nabble.com. ------------------------------------------------------------------------------ Comprehensive Server Monitoring with Site24x7. Monitor 10 servers for $9/Month. Get alerted through email, SMS, voice calls or mobile push notifications. Take corrective actions from your mobile device. http://pubads.g.doubleclick.net/gampad/clk?id=154624111&iu=/4140/ostg.clktrk _______________________________________________ WiX-devs mailing list WiX-devs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/wix-devs ------------------------------------------------------------------------------ Comprehensive Server Monitoring with Site24x7. Monitor 10 servers for $9/Month. Get alerted through email, SMS, voice calls or mobile push notifications. Take corrective actions from your mobile device. http://pubads.g.doubleclick.net/gampad/clk?id=154624111&iu=/4140/ostg.clktrk _______________________________________________ WiX-devs mailing list WiX-devs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/wix-devs
