From: Andreas E. <ae...@op...> - 2010-04-29 13:29:13
|
On 04/29/2010 03:08 PM, Ton Voon wrote: > > On 29 Apr 2010, at 13:57, Andreas Ericsson wrote: > >> >> Great. So long as we base everything on a common ancestor that should >> work just fine, and it appears as though we do, since we have the >> same commit-id from the cvs import. > > Yes, I used your op5 git repo for nagios. > Ah, nice. I'll make sure to keep that one up-to-date then. >> >> One nit though; Could you add some more text to the commit messages >> describing what a patch/commit does and why that's a good idea? >> >> Viewing the log right now, there are quite a few commits I really >> can't get the hang of. fd77c2e4dfd2fb474e7ac9bc28da5ccba94114fc is >> my favourite. Besides, if I can't figure out why a change is a good >> thing, it's likely you won't be able to either in a year or so. > > That's a fair point. I'll try to be more verbose in the commit messages. > Thanks. It gets important when others want to understand what's being done, and why (with "other" possibly being ones future self). > 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. -- 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. |