• [^] # Re: Merge

    Posté par . En réponse au message Question sur GIT. Évalué à 1.

    Cest bon j'ai réussi,

    par contre en sortie, j'ai :

    uto-merged arch/arm/mach-omap2/mux34xx.c
    Auto-merged arch/arm/mach-omap2/pm-debug.c
    CONFLICT (content): Merge conflict in arch/arm/mach-omap2/pm-debug.c
    Auto-merged arch/arm/mach-omap2/pm.h
    CONFLICT (content): Merge conflict in arch/arm/mach-omap2/pm.h
    Auto-merged arch/arm/mach-omap2/pm24xx.c
    Auto-merged arch/arm/mach-omap2/pm34xx.c
    CONFLICT (content): Merge conflict in arch/arm/mach-omap2/pm34xx.c
    Auto-merged arch/arm/mach-omap2/powerdomains34xx.h
    Auto-merged arch/arm/mach-omap2/prcm.c
    Auto-merged arch/arm/mach-omap2/prm-regbits-34xx.h
    Auto-merged arch/arm/mach-omap2/sdrc.c
    Auto-merged arch/arm/mach-omap2/sleep34xx.S
    CONFLICT (content): Merge conflict in arch/arm/mach-omap2/sleep34xx.S
    Auto-merged arch/arm/mach-omap2/usb-musb.c
    CONFLICT (content): Merge conflict in arch/arm/mach-omap2/usb-musb.c
    Auto-merged arch/arm/mm/Kconfig
    CONFLICT (content): Merge conflict in arch/arm/mm/Kconfig
    Auto-merged arch/arm/mm/alignment.c
    Auto-merged arch/arm/mm/proc-v7.S
    Auto-merged arch/arm/plat-omap/Kconfig
    CONFLICT (content): Merge conflict in arch/arm/plat-o
    ...

    Automatic merge failed; fix conflicts and then commit the result.
    debian:~/git/git.kernel.org/linux-omap-2.6# vim arch/arm/



    pour les confits, de quoi s'agit-il et comment ça se passe ?