Safest way to do it would be...
A) Pull all upstream 3.9 changes into a local 3.9 branch.
B) Create a new branch based on your existing feature branch.
C) Rebase your new feature branch based on the local 3.9 branch. (Rebase
rewrites history in the branch, so this is why we did step B to have a fallback
branch easily accessible.)
D) Push your new feature branch and submit a new pull request.
http://stackoverflow.com/questions/8948803/what-does-git-remote-add-upstream-help-achieve
From: Tobias Erichsen [mailto:i...@tobias-erichsen.de]
Sent: Thursday, November 28, 2013 2:01 PM
To: WiX toolset developer mailing list
Subject: Re: [WiX-devs] WiX v3.8 released today.
Cool thing - and thanks to you & Bob for doing this on your holiday :-)
Now that 3.8 is settled I was wondering how I should proceed with the stuff
that I had prepared
as pull-requests in my 3.8 branch - any way that I can "switch" my private 3.8
branch into 3.9 ...
I'm still not so sure about usage of GIT (especially branching & merging...)
Tobias
________________________________
Von: Rob Mensching [mailto:r...@robmensching.com]
Gesendet: Donnerstag, 28. November 2013 17:41
An: WiX toolset developer mailing list
Betreff: [WiX-devs] WiX v3.8 released today.
As you've no doubt seen by now, the WiX toolset v3.8 has released today:
http://robmensching.com/blog/posts/2013/11/28/wix-v3.8-released
I'm off to catch a plane to see some family on Thanksgiving Day. But before
that, I wanted to **thank all of you** that contributed to this release and
helped make it the best WiX toolset ever.
I'm excited to see what we can accomplish together in the future. Again, thank
you.
virtually,
Rob Mensching
------------------------------------------------------------------------------
Rapidly troubleshoot problems before they affect your business. Most IT
organizations don't have a clear picture of how application performance
affects their revenue. With AppDynamics, you get 100% visibility into your
Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
http://pubads.g.doubleclick.net/gampad/clk?id=84349351&iu=/4140/ostg.clktrk
_______________________________________________
WiX-devs mailing list
WiX-devs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/wix-devs
