If you don't want to save any modification you have done to Gambas source
code,
then easiest option is tf. Otherwise you may have to answer several more
questions.
(tf) theirs-full - accept their version of entire file
Jussi
On Fri, Nov 25, 2011 at 12:50, wally wrote:
> svn update
> Conflic
Le 25/11/2011 11:50, wally a écrit :
> svn update
> Conflict discovered in 'comp/src/gb.eval.highlight/.startup'.
> Select: (p) postpone, (df) diff-full, (e) edit,
> (mc) mine-conflict, (tc) theirs-conflict,
> (s) show all options:
>
> what to do ?
>
Normally you should type "tc"
svn update
Conflict discovered in 'comp/src/gb.eval.highlight/.startup'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options:
what to do ?
--
All
