zarb-ml/mageia-sysadm/2010-November/000764.html


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90

<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
 <HEAD>
   <TITLE> [Mageia-sysadm] [340] Merge remote branch 'vm_valstar/master'
   </TITLE>
   <LINK REL="Index" HREF="index.html" >
   <LINK REL="made" HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B340%5D%20Merge%20remote%20branch%20%27vm_valstar/master%27&In-Reply-To=%3C4CEA3A75.40801%40colin.guthr.ie%3E">
   <META NAME="robots" CONTENT="index,nofollow">
   <META http-equiv="Content-Type" content="text/html; charset=us-ascii">
   <LINK REL="Previous"  HREF="000695.html">
   <LINK REL="Next"  HREF="000685.html">
 </HEAD>
 <BODY BGCOLOR="#ffffff">
   <H1>[Mageia-sysadm] [340] Merge remote branch 'vm_valstar/master'</H1>
    <B>Colin Guthrie</B> 
    <A HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B340%5D%20Merge%20remote%20branch%20%27vm_valstar/master%27&In-Reply-To=%3C4CEA3A75.40801%40colin.guthr.ie%3E"
       TITLE="[Mageia-sysadm] [340] Merge remote branch 'vm_valstar/master'">mageia at colin.guthr.ie
       </A><BR>
    <I>Mon Nov 22 10:40:05 CET 2010</I>
    <P><UL>
        <LI>Previous message: <A HREF="000695.html">[Mageia-sysadm] [340] Merge remote branch 'vm_valstar/master'
</A></li>
        <LI>Next message: <A HREF="000685.html">[Mageia-sysadm] Puppet Report for alamut.mageia.org
</A></li>
         <LI> <B>Messages sorted by:</B> 
              <a href="date.html#764">[ date ]</a>
              <a href="thread.html#764">[ thread ]</a>
              <a href="subject.html#764">[ subject ]</a>
              <a href="author.html#764">[ author ]</a>
         </LI>
       </UL>
    <HR>  
<!--beginarticle-->
<PRE>'Twas brillig, and Michael scherer at 20/11/10 11:57 did gyre and gimble:
&gt;<i> On Sat, Nov 20, 2010 at 12:52:54PM +0100, <A HREF="https://www.mageia.org/mailman/listinfo/mageia-sysadm">root at mageia.org</A> wrote:
</I>&gt;&gt;<i> Revision: 340
</I>&gt;&gt;<i> Author:   misc
</I>&gt;&gt;<i> Date:     2010-11-20 12:52:54 +0100 (Sat, 20 Nov 2010)
</I>&gt;&gt;<i> Log Message:
</I>&gt;&gt;<i> -----------
</I>&gt;&gt;<i> Merge remote branch 'vm_valstar/master'
</I>&gt;<i> 
</I>&gt;<i> Oups :/
</I>&gt;<i> 
</I>&gt;<i> Sorry, I (again) managed to do thing wrong with git merge.
</I>
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
<A HREF="http://colin.guthr.ie/">http://colin.guthr.ie/</A>

Day Job:
  Tribalogic Limited [<A HREF="http://www.tribalogic.net/">http://www.tribalogic.net/</A>]
Open Source:
  Mageia Contributor [<A HREF="http://www.mageia.org/">http://www.mageia.org/</A>]
  PulseAudio Hacker [<A HREF="http://www.pulseaudio.org/">http://www.pulseaudio.org/</A>]
  Trac Hacker [<A HREF="http://trac.edgewall.org/">http://trac.edgewall.org/</A>]
</PRE>


<!--endarticle-->
    <HR>
    <P><UL>
        <!--threads-->
	<LI>Previous message: <A HREF="000695.html">[Mageia-sysadm] [340] Merge remote branch 'vm_valstar/master'
</A></li>
	<LI>Next message: <A HREF="000685.html">[Mageia-sysadm] Puppet Report for alamut.mageia.org
</A></li>
         <LI> <B>Messages sorted by:</B> 
              <a href="date.html#764">[ date ]</a>
              <a href="thread.html#764">[ thread ]</a>
              <a href="subject.html#764">[ subject ]</a>
              <a href="author.html#764">[ author ]</a>
         </LI>
       </UL>

<hr>
<a href="https://www.mageia.org/mailman/listinfo/mageia-sysadm">More information about the Mageia-sysadm
mailing list</a><br>
</body></html>