Re: Merge 'G' -- what the h* is it?

Miha Vitorovic <mvitorovic_at_nil.si> writes:
> I'm having some fun with merging (the old style), and the dry run tells
> me:
>
> G wk/images
>
> Searching the help did not reveal me what 'G' stands for? Can someone
> enlighten me (and maybe put this into the help text).
>
> Thanks in advance and best regards,

merGed -- meaning that there were local modifications in the file *and*
new changes brought in via the merge (or update), but the two did not
conflict (otherwise you would have seen "C").

See:

   svn help update
   svnbook.red-bean.com

It would be nice if 'svn merge' pointed the user to the help for update,
since they use the same status letters.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-06-23 17:28:25 CEST