From: Andreas E. <ae...@op...> - 2010-04-29 15:16:22
|
On 04/29/2010 03:42 PM, Ton Voon wrote: > > On 29 Apr 2010, at 14:29, Andreas Ericsson wrote: > >>> I'm trying to merge in your cleanups which is in origin/dev (?). >>> But I >>> get: >>> >>> $ git merge origin/dev >>> error: Untracked working tree file 'include/cgiutils.h' would be >>> overwritten by merge. >>> fatal: merging of trees 6e873029f92756295b62976258d55691a9aee329 and >>> 3445b4fc91fbd54c1387f51e6c321305abc0a546 failed >>> Merge with strategy recursive failed. >>> >>> What does this mean and how do I resolve? >>> >> >> It means I've added a file to version control that is in your >> worktree but not tracked by git in your end. Do a "make distclean" >> first and it should work, or just remove it manually. That one is >> a generated file before my cleanups, and a tracked file after >> them, and git refuses to overwrite non-tracked content since it >> would mean you'd lose work with no chance of restoring it. > > That has fixed it thanks. I've added a note for myself at http://wiki.nagios.org/index.php/GIT_Introduction#Troubleshooting > > > With this merge, it looks like things are failing to compile: > > $ make nagios > cd ./base&& make > gcc -g -O2 -DHAVE_CONFIG_H -DNSCORE -c -o macros-base.o ../common/ > macros.c > ../common/macros.c: In function ‘init_macrox_names’: > ../common/macros.c:2512: error: ‘HOSTNAME’ undeclared (first use in > this function) > ../common/macros.c:2512: error: (Each undeclared identifier is > reported only once > ../common/macros.c:2512: error: for each function it appears in.) > ../common/macros.c:2513: error: ‘HOSTALIAS’ undeclared (first use in > this function) > .... > > I can't see a macro definition for HOSTNAME anywhere. Have you missed > a file? > No, but a hash-sign in common/macros.c. Issue git pull git://git.op5.org/nagios.git dev and you should get the fix. It was a work-in-progress commit that accidentally got published. I shall strive to be more careful in the future. -- Andreas Ericsson and...@op... OP5 AB www.op5.se Tel: +46 8-230225 Fax: +46 8-230231 Considering the successes of the wars on alcohol, poverty, drugs and terror, I think we should give some serious thought to declaring war on peace. |