You can totally rebase if only one machine has seen the changes. You can even
do it if other machines have seen the change if those machines agree to go
through an annoying dance to get things straightened out.
If you have a pull request out, yank it before it gets accepted otherwise bets
are off because my machines don't usually have time to the annoying dance.
<smile/>
From: Heath Stewart [mailto:hea...@outlook.com]
Sent: Monday, April 21, 2014 4:42 PM
To: wix-devs@lists.sourceforge.net
Subject: [WiX-devs] Rebase or merge?
Obviously rebasing pushed branches is bad, but if Rob hasn't yet merged a
branch of my own fork should I rebase on the latest 'develop' and push to a new
temp branch / re-request a pull, or just updating the existing pull request
branch with a merge of 'develop' and my commit to resolve feedback?
Heath Stewart
Software Design Engineer
Visual Studio, Microsoft
http://blogs.msdn.com/heaths
------------------------------------------------------------------------------
Start Your Social Network Today - Download eXo Platform
Build your Enterprise Intranet with eXo Platform Software
Java Based Open Source Intranet - Social, Extensible, Cloud Ready
Get Started Now And Turn Your Intranet Into A Collaboration Platform
http://p.sf.net/sfu/ExoPlatform
_______________________________________________
WiX-devs mailing list
WiX-devs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/wix-devs
