Quoting Michał Kułach (michalkul...@gmail.com):
> If you think about something like this:
> $ svn update
> Conflict discovered in '.po'.
> Select: (p) postpone, (df) diff-full, (e) edit,
> (mc) mine-conflict, (tc) theirs-conflict,
>
Dnia 02-05-2013 o 23:50:43 victory napisał(a):
On Fri, 3 May 2013 00:25:44 +0300
Andrei POPESCU wrote:
Could you please help me with the magic incantations to be able to merge
my locally changed file with the SVN refreshed ones? I'm sure there must
be a better method than manually solving all
On Fri, 3 May 2013 00:25:44 +0300
Andrei POPESCU wrote:
> Could you please help me with the magic incantations to be able to merge
> my locally changed file with the SVN refreshed ones? I'm sure there must
> be a better method than manually solving all VCS conflicts or manually
> merging my cha
3 matches
Mail list logo
