thresh@hasher /git/packages/net-snmp $ git pull . upstream
Trying really trivial in-index merge...
fatal: Merge requires file-level merging
Nope.
Merging HEAD with 8b6ce07f81d2103833c11e8f712df463be1284af
Merging:
2c59a84 Added files, needed for packaging:
8b6ce07 5.4 source tree.
found 1 common ancestor(s):
4aa5364 Initial commit of 5.3.1 source tree.
Auto-merging net-snmp/Makefile.in
merge: warning: conflicts during merge
CONFLICT (content): Merge conflict in net-snmp/Makefile.in
Auto-merging net-snmp/aclocal.m4
merge: warning: conflicts during merge
CONFLICT (content): Merge conflict in net-snmp/aclocal.m4
Auto-merging net-snmp/agent/Makefile.in
merge: warning: conflicts during merge
CONFLICT (content): Merge conflict in net-snmp/agent/Makefile.in
Auto-merging net-snmp/agent/agent_registry.c
Auto-merging net-snmp/agent/helpers/Makefile.in
Auto-merging net-snmp/agent/mibgroup/host/hr_filesys.c
Auto-merging net-snmp/agent/mibgroup/if-mib/data_access/interface_linux.c
merge: warning: conflicts during merge
CONFLICT (content): Merge conflict in net-snmp/agent/mibgroup/if-mib/data_access/interface_linux.c
Auto-merging net-snmp/agent/mibgroup/ip-mib/data_access/ipaddress_linux.c
merge: warning: conflicts during merge
CONFLICT (content): Merge conflict in net-snmp/agent/mibgroup/ip-mib/data_access/ipaddress_linux.c
Auto-merging net-snmp/agent/mibgroup/mibII/at.c
merge: warning: conflicts during merge
CONFLICT (content): Merge conflict in net-snmp/agent/mibgroup/mibII/at.c
Auto-merging net-snmp/agent/mibgroup/mibII/ipv6.c
Auto-merging net-snmp/agent/mibgroup/mibII/var_route.c
merge: warning: conflicts during merge
CONFLICT (content): Merge conflict in net-snmp/agent/mibgroup/mibII/var_route.c
Auto-merging net-snmp/agent/mibgroup/ucd-snmp/lmSensors.c
merge: warning: conflicts during merge
CONFLICT (content): Merge conflict in net-snmp/agent/mibgroup/ucd-snmp/lmSensors.c
Auto-merging net-snmp/agent/mibgroup/ucd-snmp/pass_persist.c
Auto-merging net-snmp/agent/snmp_agent.c
merge: warning: conflicts during merge
CONFLICT (content): Merge conflict in net-snmp/agent/snmp_agent.c
Auto-merging net-snmp/agent/snmp_vars.c
Auto-merging net-snmp/configure.in
merge: warning: conflicts during merge
CONFLICT (content): Merge conflict in net-snmp/configure.in
Removing net-snmp/include/net-snmp/system/solaris2.10.h
Removing net-snmp/include/net-snmp/system/solaris2.7.h
Removing net-snmp/include/net-snmp/system/solaris2.8.h
Removing net-snmp/include/net-snmp/system/solaris2.9.h
Auto-merging net-snmp/net-snmp-config.in
Auto-merging net-snmp/perl/SNMP/SNMP.xs
merge: warning: conflicts during merge
CONFLICT (content): Merge conflict in net-snmp/perl/SNMP/SNMP.xs
Auto-merging net-snmp/perl/TrapReceiver/Makefile.PL
Auto-merging net-snmp/perl/agent/Makefile.PL
Auto-merging net-snmp/snmplib/Makefile.in
merge: warning: conflicts during merge
CONFLICT (content): Merge conflict in net-snmp/snmplib/Makefile.in
Automatic merge failed; fix conflicts and then commit the result.
thresh@hasher /git/packages/net-snmp $