mib2c-update: unable to merge automatically.

I'm starting to get this 'error' cropping up on my files when using
mib2c-update on my source files (it's previously had no problem
merging MIB changes into my modified sources.):

-----------8<--------
# SNMPD:updating .o files for ndCCUGPRMCGroup
export UPDATE_MIB2C_OPTS="-q -I mib2c_config"; \
        export UPDATE_CONF=mib2c.scalar.conf; \
        export UPDATE_OID=ndCCUGPRMCGroup; \
        export MIBS="+NDRAIL-MIB"; \
        mib2c-update; \
        touch ndCCUGPRMCGroup.c
Starting regneration of ndCCUGPRMCGroup using mib2c.scalar.conf at
2008-01-07_04.14
It appears that the last run of mib2c-update was not able to merge
your changes automatically. Do you want to:

[c)opy merged files to /home/paul/Documents/svn/trunk/apps/ndsnmp]
[r)e-run from scratch]
[q)uit]
(c|r|q) ?
-----------8<--------

http://net-snmp.sourceforge.net/wiki/index.php/TUT:mib2c-update would
appear to be the answer to my request below, however it appears to be
a little light on explanation, and most searches for other likely
search strings on Google are simply turning up sources for
mib2c-update.

Are there any pages out there that detail:

1) what to do to not get in this situation in the first place and/or
2) what am I doing to cause this?
3) what does (c) and (r) do above? (Selecting r appears to leave my
sources in place, but the error comes up on the next make. Selecting c
appears to indicate that I should be doing something outside of the
make, but isn't clear to me what exactly.)
4) what to do to get out of the situation?
(http://net-snmp.sourceforge.net/wiki/index.php/TUT:mib2c-update#Manual_updates
appears to give some sort of instruction, but the 'old' and 'new'
files from mib2c-update are identical - the instructions indicate they
should be different.)
5) which search strings should I have been putting in Google to find
said web page?

TIA for any help given.

-- 
PJH

http://shabbleland.myminicity.com/

-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Net-snmp-users mailing list
[email protected]
Please see the following page to unsubscribe or change other options:
https://lists.sourceforge.net/lists/listinfo/net-snmp-users