Help please :-)

From: Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com>
Date: Apr 15, 2006, 16:08 UTC
Message-ID: <4d8e3fd30604150908m565e8aaat8ef9846a85c4036e@mail.gmail.com>

Hi all,
I'm used to keep updated my linux tree with cg-status,
I did that this morning but now I see the following:
paolo@Italia:~/linux-2.6$ cg-status
Heads:
   >master      2c5362007bc0a46461a9d94958cdd53bb027004c
  R origin      2c5362007bc0a46461a9d94958cdd53bb027004c

? arch/i386/kernel/smpboot.c.rej ? drivers/md/dm-stripe.c.rej ? drivers/net/chelsio/sge.c.rej ? drivers/net/e100.c.rej ? drivers/net/e1000/e1000_main.c.rej ? fs/9p/vfs_dir.c.rej ? fs/nfsctl.c.rej ? kernel/fork.c.rej ? kernel/posix-timers.c.rej ? kernel/timer.c.rej ? mm/memory.c.rej ? mm/mempolicy.c.rej ? mm/swap.c.rej ? net/ieee80211/ieee80211_crypt_ccmp.c.rej ? net/ieee80211/ieee80211_rx.c.rej ? scripts/kconfig/lkc_defs.h ? scripts/mod/modpost.c.rej paolo@Italia:~/linux-2.6$ cg-diff

I'm a bit lost, the tree is correctly updated, no error message but why I see all these .rej? And how can I fix this problem? git reset and cg-reset don't help...

Thanks!

-- Paolo http://paolociarrocchi.googlepages.com