blob: 9193ce514191d141002ec44536727c212c5f04c7 (
plain)
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
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
|
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
<HEAD>
<TITLE> [Mageia-dev] mgarepo question
</TITLE>
<LINK REL="Index" HREF="index.html" >
<LINK REL="made" HREF="mailto:mageia-dev%40mageia.org?Subject=Re%3A%20%5BMageia-dev%5D%20mgarepo%20question&In-Reply-To=%3C201210270316.35820.cooker%40solbu.net%3E">
<META NAME="robots" CONTENT="index,nofollow">
<META http-equiv="Content-Type" content="text/html; charset=us-ascii">
<LINK REL="Previous" HREF="019555.html">
<LINK REL="Next" HREF="019560.html">
</HEAD>
<BODY BGCOLOR="#ffffff">
<H1>[Mageia-dev] mgarepo question</H1>
<B>Johnny A. Solbu</B>
<A HREF="mailto:mageia-dev%40mageia.org?Subject=Re%3A%20%5BMageia-dev%5D%20mgarepo%20question&In-Reply-To=%3C201210270316.35820.cooker%40solbu.net%3E"
TITLE="[Mageia-dev] mgarepo question">cooker at solbu.net
</A><BR>
<I>Sat Oct 27 03:16:32 CEST 2012</I>
<P><UL>
<LI>Previous message: <A HREF="019555.html">[Mageia-dev] Establishing a Mageia Mirror in Israel
</A></li>
<LI>Next message: <A HREF="019560.html">[Mageia-dev] mgarepo question
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#19559">[ date ]</a>
<a href="thread.html#19559">[ thread ]</a>
<a href="subject.html#19559">[ subject ]</a>
<a href="author.html#19559">[ author ]</a>
</LI>
</UL>
<HR>
<!--beginarticle-->
<PRE>Hi.
I have encountered a problem with mgarepo that I've never had to deal with until now.
A package I'm working on has been updated and submitted, before I was finished, and I'm fine with it.
But «mgarepo up» is asking me what to do, and I have several choices. Two of the choices are «(mc) my conflict» and «(tc) their conflict». (translated)
I have never had a conflict hapening as a result of someone else working on my packages before, so I don't know which these to options do what.
THink that one of them means that my copy is the copy to use, and the other option means that my copy is to be discarded in favour of the remote copy. but I don't know which option actually does what.
It is Not obvious what the options do, for someone not used to having conflicts. And the manpage or documentation does not mention any options of any kind.
Can anyone explain to me what these two options do?
--
Johnny A. Solbu
PGP key ID: 0xFA687324
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part.
URL: </pipermail/mageia-dev/attachments/20121027/79bea2f1/attachment.asc>
</PRE>
<!--endarticle-->
<HR>
<P><UL>
<!--threads-->
<LI>Previous message: <A HREF="019555.html">[Mageia-dev] Establishing a Mageia Mirror in Israel
</A></li>
<LI>Next message: <A HREF="019560.html">[Mageia-dev] mgarepo question
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#19559">[ date ]</a>
<a href="thread.html#19559">[ thread ]</a>
<a href="subject.html#19559">[ subject ]</a>
<a href="author.html#19559">[ author ]</a>
</LI>
</UL>
<hr>
<a href="https://www.mageia.org/mailman/listinfo/mageia-dev">More information about the Mageia-dev
mailing list</a><br>
</body></html>
|
