[Mageia-sysadm] [340] Merge remote branch 'vm_valstar/master'

[Colin Guthrie]

'Twas brillig, and Michael scherer at 20/11/10 11:57 did gyre and gimble:
> On Sat, Nov 20, 2010 at 12:52:54PM +0100, root at mageia.org wrote:
>> Revision: 340
>> Author:   misc
>> Date:     2010-11-20 12:52:54 +0100 (Sat, 20 Nov 2010)
>> Log Message:
>> -----------
>> Merge remote branch 'vm_valstar/master'
> 
> Oups :/
> 
> Sorry, I (again) managed to do thing wrong with git merge.

Yeah I've been bitten a few times with that. The trick is to never use
git merge when dealing with svn as the ultimate destination. Always
rebase. It's a bitch for real distributed git work, but it's fine if
it's a private repo. :)

Col

-- 

Colin Guthrie
mageia(at)colin.guthr.ie
http://colin.guthr.ie/

Day Job:
  Tribalogic Limited [http://www.tribalogic.net/]
Open Source:
  Mageia Contributor [http://www.mageia.org/]
  PulseAudio Hacker [http://www.pulseaudio.org/]
  Trac Hacker [http://trac.edgewall.org/]