r16612 - gnucash/branches/gda-dev - 1) Merge with trunk up to 16597
warlord at MIT.EDU
Mon Dec 10 12:40:04 EST 2007
Phil Longstaff <plongstaff at rogers.com> writes:
> I don't want to do this right now, but at some point we should do
> this. I know there was one merge which I had a lot of trouble with.
> One way I haven't been doing the merges in the manner you probably want
> is that I've been doing them manually, picking and choosing even
> portions of a changeset.
That's not good at all! When merging up from trunk you need to
pull up EVERYTHING! You can't cherry-pick, otherwise it makes
it impossible to merge back into trunk without losing changes!
Unfortunately, you might need to "start over" with a completely
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-devel