I wouldn't recommend usage of "tc" to non-developers, it doesn't accept
whole file and it can leave mess behind.
http://stackoverflow.com/questions/2121158/a-example-of-a-change-that-is-not-a-conflict
Also by using "tc" you may need to answer several times for same file.
Jussi
On Mon, Nov 2
Thank you, Benoît.
bye
vuott
--- Lun 26/11/12, Benoît Minisini ha scritto:
> Da: Benoît Minisini
> Oggetto: Re: [Gambas-user] Conflict in rev. #5378
> A: "mailing list for gambas users"
> Data: Lunedì 26 novembre 2012, 18:08
> Le 26/11/2012 16:34, Ru Vu
Well, Jussi, thank you so much.
vuo
--- Lun 26/11/12, Jussi Lahtinen ha scritto:
> Da: Jussi Lahtinen
> Oggetto: Re: [Gambas-user] Conflict in rev. #5378
> A: "mailing list for gambas users"
> Data: Lunedì 26 novembre 2012, 17:14
> I assume you are not cont
Le 26/11/2012 16:34, Ru Vuott a écrit :
> Hello,
>
> by updating my Gambas 3 with rev. 5378, I obtained this notice of conflict:
>
>
> Rilevato conflitto in 'trunk/comp/src/gb.map/.info'.
> Select: (p) postpone, (df) diff-full, (e) edit,
> (mc) mine-conflict, (tc) theirs-conflict,
>
I assume you are not contributing to Gambas code, so just type tf.
(tf) theirs-full - accept their version of entire file
Jussi
On Mon, Nov 26, 2012 at 5:39 PM, Ru Vuott wrote:
> Hello,
>
> by updating my Gambas 3 with rev. 5378, I obtained this notice of conflict:
>
>
> Rilevato conflitto in
Hello,
by updating my Gambas 3 with rev. 5378, I obtained this notice of conflict:
Rilevato conflitto in 'trunk/comp/src/gb.map/.info'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options:
Well, in your opinion what's t
Hello,
by updating my Gambas 3 with rev. 5378, I obtained this notice of conflict:
Rilevato conflitto in 'trunk/comp/src/gb.map/.info'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options:
Well, in your opinion what's t
