Re: [Gramps-devel] svn up codes

[Nick H. <nic...@ho...>]

Rob,

As the other two posters said, it means that a file that you have edited 
locally was also changed in the repository, but the changes were 
successfully merGed together.

You may be interested in reading this svn book:

http://svnbook.red-bean.com/en/1.5/svn-book.pdf

Page 25 mentions the merge code and then goes on the describe conflict 
resolution.

Regards,

Nick.

Rob Healey wrote:
> Greetings:
>
> I completed an svn up command tonight, and got a different letter in 
> the far left of the filenames.  I am not sure what it means, but here 
> it is:
>
> G    src/plugins/webreport/NarrativeWeb.py
>
> The letter G: what does it mean?
>
> Sincerely yours,
> Rob G. Healey
>
> ------------------------------------------------------------------------
>
> ------------------------------------------------------------------------------
> This SF.Net email is sponsored by the Verizon Developer Community
> Take advantage of Verizon's best-in-class app development support
> A streamlined, 14 day to market process makes app distribution fast and easy
> Join now and get one step closer to millions of Verizon customers
> http://p.sf.net/sfu/verizon-dev2dev 
> ------------------------------------------------------------------------
>
> _______________________________________________
> Gramps-devel mailing list
> Gra...@li...
> https://lists.sourceforge.net/lists/listinfo/gramps-devel
>