The rebase is done. On your next fetch you can: $ git stash save # make sure that no tracked files are in the way because the next command WILL DESTROY ANY UNCOMMITTED CHANGES to tracked files $ git reset --hard origin/feature/catalyst-configurator $ git stash pop
and you are now on top of the rebased feature/catalyst-configurator On 06/13/2012 09:48 PM, Olivier Bilodeau wrote: > Tomorrow we will rebase the feature/catalyst-configurator branch on top > of the devel branch in order for it to include all that's been in 3.4.0. > > People with non-merged changes on top of that branch should hurry to get > these changes integrated before we rebase or suffer the consequence (see > git help rebase). > > You have been warned. > > Cheers! -- Olivier Bilodeau obilod...@inverse.ca :: +1.514.447.4918 *115 :: www.inverse.ca Inverse inc. :: Leaders behind SOGo (www.sogo.nu) and PacketFence (www.packetfence.org) ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ PacketFence-devel mailing list PacketFence-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/packetfence-devel
