git question: resolving conflicts

[Matt Price]

hi,

i'm a terrible coder but I'm trying to work with the ubuntu kernel
source, making a few modifications so that it's easier to build custom
kernels on ubuntu (I hate how complex it is on the current set up).
anyway I'm merging the suspend2 git tree and the ubuntu tree, andthere
are currently a couple of merge conflicts:  

$ cg-branch-add suspend2
git://git.kernel.org/pub/scm/linux/kernel/git/nigelc/suspend2-head.git
$ cg-update suspend2
...
Applying changes...
Merging 549ae0ac3d574a682e82b02e79259a65445a675b ->
83f6a220185d229f6d54098ecd774837c3cd1e33
        to c665c66bd17e9dd5bad964a4befbe649c6c95474 ...

..........
 Auto-merging drivers/usb/host/ehci-hub.c
    CONFLICTS during merge.
MERGE ERROR: File drivers/usb/host/ehci-ps3.c added in both branches,
but different in each!
MERGE ERROR: Conflicting versions saved as
'drivers/usb/host/ehci-ps3.c~ubuntu-suspend2' and
'drivers/usb/host/ehci-ps3.c~suspend2'.
... Auto-merging drivers/usb/host/ehci.h
... Auto-merging drivers/usb/host/ohci-at91.c
MERGE ERROR: File drivers/usb/host/ohci-ppc-of.c added in both branches,
but different in each!
MERGE ERROR: Conflicting versions saved as
'drivers/usb/host/ohci-ppc-of.c~ubuntu-suspend2' and
'drivers/usb/host/ohci-ppc-of.c~suspend2'.
MERGE ERROR: File drivers/usb/host/ohci-ps3.c added in both branches,
but different in each!
MERGE ERROR: Conflicting versions saved as
'drivers/usb/host/ohci-ps3.c~ubuntu-suspend2' and
'drivers/usb/host/ohci-ps3.c~suspend2'.
.....

        Conflicts during merge. Do cg-commit after resolving them.
        cg-reset will cancel the merge.
-------------------------
since I'm a bit ignorant, I also looked at cg-status:
? arch/powerpc/platforms/ps3/system-bus.c~suspend2
? arch/powerpc/platforms/ps3/system-bus.c~ubuntu-suspend2
? drivers/usb/host/ehci-ps3.c~suspend2
? drivers/usb/host/ehci-ps3.c~ubuntu-suspend2
? drivers/usb/host/ohci-ppc-of.c~suspend2
? drivers/usb/host/ohci-ppc-of.c~ubuntu-suspend2
? drivers/usb/host/ohci-ps3.c~suspend2
? drivers/usb/host/ohci-ps3.c~ubuntu-suspend2

the differences between the files seem to be pretty minor and I think I
can just fix them without knowing what's going on ( in any case I'm
compiling on i386, not ppc).  However, I guess I don't know how to
resolve conflicts in git!  I madethe changes I thought appropriate, then
typed:
$ cg-commit ohci-ppc-of.c ohci-ps3.c ehci-ps3.c

and got:

cg-commit: cannot commit individual files when merging


so obviously I'm missing something but I confess that my head swims when
I try to read the git documentation.  ANy hints for a semi-tech what I
ought to do in this instance?

thanks much,

matt

-- 
Matt Price
History Dept
University of Toronto
matt.price-H217xnMUJC0sA/PxXw9srA at public.gmane.org
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://gtalug.org/pipermail/legacy/attachments/20070208/73625920/attachment.sig>