CVS update: gnucash/src/app-file

Derek Atkins warlord at MIT.EDU
Wed Jul 30 00:53:11 CDT 2003


linas at linas.org (Linas Vepstas) writes:

> There's nothing to merge! There's no gnome2 code in this file!
> cvs update -j gnome2 
> is a no-op for this file, there will be no conflicts to resolve.

Just because there isn't any gnome code doesn't mean there have
not been changes in the gnome2 port. 

> I really don't get the issue.

The issue is a general one, not necessarily specific to this case..
Basically, gratuitous white-space changes can cause merge problems,
so should be avoided until after the gnome2 merge back into head.

> --linas

-derek

-- 
       Derek Atkins, SB '93 MIT EE, SM '95 MIT Media Laboratory
       Member, MIT Student Information Processing Board  (SIPB)
       URL: http://web.mit.edu/warlord/    PP-ASEL-IA     N1NWH
       warlord at MIT.EDU                        PGP key available


More information about the gnucash-patches mailing list