From 1be510f9529cb082f802408b472a77d074b394c0 Mon Sep 17 00:00:00 2001 From: Nicolas Vigier Date: Sun, 14 Apr 2013 13:46:12 +0000 Subject: Add zarb MLs html archives --- zarb-ml/mageia-sysadm/2010-November/000764.html | 90 +++++++++++++++++++++++++ 1 file changed, 90 insertions(+) create mode 100644 zarb-ml/mageia-sysadm/2010-November/000764.html (limited to 'zarb-ml/mageia-sysadm/2010-November/000764.html') diff --git a/zarb-ml/mageia-sysadm/2010-November/000764.html b/zarb-ml/mageia-sysadm/2010-November/000764.html new file mode 100644 index 000000000..e0b336556 --- /dev/null +++ b/zarb-ml/mageia-sysadm/2010-November/000764.html @@ -0,0 +1,90 @@ + + + + [Mageia-sysadm] [340] Merge remote branch 'vm_valstar/master' + + + + + + + + + +

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

+ Colin Guthrie + mageia at colin.guthr.ie +
+ Mon Nov 22 10:40:05 CET 2010 +

+
+ +
'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/]
+
+ + + + + +
+

+ +
+More information about the Mageia-sysadm +mailing list
+ -- cgit v1.2.1