From: "Robert P. J. Day" <rpjday@crashcourse.ca>
To: Peter Teoh <htmldeveloper@gmail.com>
Cc: linux-mm@kvack.org,
"kernelnewbies@nl.linux.org" <kernelnewbies@nl.linux.org>
Subject: Re: git-pull conflict - how to solve it?
Date: Tue, 5 Feb 2008 05:15:34 -0500 (EST) [thread overview]
Message-ID: <alpine.LFD.1.00.0802050513260.10438@localhost.localdomain> (raw)
In-Reply-To: <804dabb00802050148l3b379016we5fc54f326121276@mail.gmail.com>
On Tue, 5 Feb 2008, Peter Teoh wrote:
> After I issued "git pull" I got the following conflicts:
>
> remote: Counting objects: 3463, done.
> remote: Compressing objects: 100% (459/459), done.
> Indexing 2612 objects...
> remote: Total 2612 (delta 2236), reused 2528 (delta 2152)
> 100% (2612/2612) done
> Resolving 2236 deltas...
> 100% (2236/2236) done
> 718 objects were added to complete this thin pack.
> * refs/remotes/origin/master: fast forward to branch 'master' of
> git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
> old..new: 795d45b..5329cf8
> * refs/remotes/origin/mm: forcing update to non-fast forward branch
> 'mm' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
> old...new: b7e245f...1c207e8
> Removed Documentation/smp.txt
> Removed arch/arm/Kconfig.instrumentation
> Removed arch/arm/mach-ixp4xx/dsmg600-power.c
> Removed arch/arm/mach-ixp4xx/nas100d-power.c
> Removed arch/arm/mach-ixp4xx/nslu2-power.c
> Auto-merged arch/x86/Kconfig
> Auto-merged arch/x86/mm/ioremap.c
> CONFLICT (content): Merge conflict in arch/x86/mm/ioremap.c
> Removed drivers/net/mipsnet.h
> Removed drivers/pci/pcie/aspm.c
> Removed include/linux/aspm.h
> Removed kernel/Kconfig.instrumentation
> Automatic merge failed; fix conflicts and then commit the result.
>
> I really don't know what happens? Please help me, thanks.
i'm currently up to date WRT git and i haven't seen that kind of
merge conflict. if all else fails, just remove your entire working
copy (leaving the .git directory where it is) with:
$ rm -rf *
do the pull, then recheck everything out with:
$ git checkout -f
that might be brute force, but it should work. if you *still* have a
conflict, then you must have made some changes and committed them or
something similar.
rday
--
========================================================================
Robert P. J. Day
Linux Consulting, Training and Annoying Kernel Pedantry
Waterloo, Ontario, CANADA
Home page: http://crashcourse.ca
Fedora Cookbook: http://crashcourse.ca/wiki/index.php/Fedora_Cookbook
========================================================================
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2008-02-05 10:15 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-02-05 9:48 Peter Teoh
2008-02-05 10:15 ` Robert P. J. Day [this message]
2008-02-05 10:16 ` Peter Teoh
2008-02-05 10:23 ` Robert P. J. Day
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.LFD.1.00.0802050513260.10438@localhost.localdomain \
--to=rpjday@crashcourse.ca \
--cc=htmldeveloper@gmail.com \
--cc=kernelnewbies@nl.linux.org \
--cc=linux-mm@kvack.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox