[wix-devs] update: Github - preparing to work on 4932

[Bob Arnson]

I do branches. Here's my typical GitHub workflow: Your fork is your copy of the "official" wix3 repo (made on GitHub). You clone your fork locally and do your work in that clone. You can do everything with one fork and multiple branches. Create a new branch for a new feature, send the PR, and delete the branch. Or keep it; disk space is cheap and it's always fun to reminisce about old code...

-----Original Message-----
From: wix-devs [mailto:wix-devs-bounces at lists.wixtoolset.org] On Behalf Of John Cooper
Sent: Friday, 23 October, 2015 18:21
To: WiX Toolset Developer Mailing List <wix-devs at lists.wixtoolset.org>
Subject: Re: [wix-devs] update: Github - preparing to work on 4932

Having done it both ways, I would recommend using one or more forks as:  1) much easier to cut a PR off of; and 2) much easier to keep track of each of them compared to a GIT branch when doing multiple projects.  Branches in GIT seem more useful for distinguishing between releases etc.  However, I've seen it done differently too.

--
John Merryweather Cooper
Senior Software Engineer | Integration Development Group | Enterprise Notification Service Jack Henry & Associates, Inc.® | Lenexa, KS  66214 | Ext:  431050 |JoCooper at jackhenry.com



-----Original Message-----
From: wix-devs [mailto:wix-devs-bounces at lists.wixtoolset.org] On Behalf Of Phill Hogland
Sent: Friday, October 23, 2015 5:03 PM
To: WiX Toolset Developer Mailing List <wix-devs at lists.wixtoolset.org>
Subject: [wix-devs] update: Github - preparing to work on 4932

The e-mail below is from an external source.  Please do not open attachments or click links from an unknown or suspicious origin.

In Github Desktop in the branch pulldown I switched from 4592_RmuAddProcessesByName to 'develop' and told it to 'Update', and watching the folder tree in Explorer it added a bunch of files that did not exist in 3.9 (which last updated).  I then successfully built a debug build (with warnings in the log related to version conflicts - which mostly seemed to relate to votive).  My batch file that launches the build calls the v 12.0 version of MSBuild and some of the version conflicts seem to expect the v 4.0 version of MSBuild.  (So let me know if I am doing it wrong.)  The resulting binaries are versioned 3.10.  etc, so it looks like I do have a development environment to play with.

I get the impression from my notes that I should use Github Desktop to create a new branch off of 'develop', but my notes also talk about creating a Fork and I am not sure which to do, and if I should do something to the old 4592 branch.

Thanks!



-----Original Message-----
From: wix-devs [mailto:wix-devs-bounces at lists.wixtoolset.org] On Behalf Of Phill Hogland
Sent: Friday, October 23, 2015 4:21 PM
To: WiX Toolset Developer Mailing List <wix-devs at lists.wixtoolset.org>
Subject: [wix-devs] Github - preparing to work on 4932

I am sorry that I am so dense when it comes to using github.  I used the Windows client for github some time back (too long ago) to submit a pull request for 4592.  I kept notes on the steps for using github while working on 4592, but I think the repository was moved from codeplex and so I am not sure what the next step should be to start working on 4932.  When I open github it asks if I want to update, sync, or delete 4592_RmuAddProcessesByName.  Should I delete it? And if so do I delete just the local one or "both"?

Then I think I need to create a fork to get started again.  Thanks for any advice.
____________________________________________________________________
WiX Toolset Developer Mailing List provided by FireGiant http://www.firegiant.com/ ____________________________________________________________________
WiX Toolset Developer Mailing List provided by FireGiant http://www.firegiant.com/

NOTICE: This electronic mail message and any files transmitted with it are intended exclusively for the individual or entity to which it is addressed. The message, together with any attachment, may contain confidential and/or privileged information.
Any unauthorized review, use, printing, saving, copying, disclosure or distribution is strictly prohibited. If you have received this message in error, please immediately advise the sender by reply email and delete all copies.

____________________________________________________________________
WiX Toolset Developer Mailing List provided by FireGiant http://www.firegiant.com/