From: Wink Saville <wink@saville.com>
To: Linus Torvalds <torvalds@osdl.org>
Cc: git <git@vger.kernel.org>
Subject: Re: Resolving conflicts
Date: Fri, 01 Dec 2006 00:22:26 -0800 [thread overview]
Message-ID: <456FE642.6020102@saville.com> (raw)
In-Reply-To: <Pine.LNX.4.64.0611302359400.3695@woody.osdl.org>
Linus Torvalds wrote:
>
> On Thu, 30 Nov 2006, Linus Torvalds wrote:
>> No, kdiff3 probably doesn't have the same semantics, so better get the
>> "real" merge. It's almost certainly in the rcs package, so "emerge rcs"
>> should do it.
>
> ..and just to be safe, remove the symlink first, so that you don't end up
> overwriting the "kdiff3" binary by mistake when you install the real
> "merge". Not that I think emerge is quite that stupid a package manager,
> but anyway..
>
> Linus
>
Ubuntu is debian based and I use Synaptic GUI, a front end to apt-get. My earlier problem
was I couldn't find which package "merge" was in. But now I just figured it out by going
to debian.org and using "Search the contents of packages" for "merge". Turns out "merge"
is in devel/rcs which of course the whole world knows, unless your a neophyte like me:)
Any way after getting the real merge, I reverted the first pull and re-did it and all was well:
wink@winkc2d1:~/linux/linux-2.6$ git-checkout -f
wink@winkc2d1:~/linux/linux-2.6$ git-status
# On branch refs/heads/ace
nothing to commit
wink@winkc2d1:~/linux/linux-2.6$ git-pull . master
Trying really trivial in-index merge...
fatal: Merge requires file-level merging
Nope.
Merging HEAD with 0215ffb08ce99e2bb59eca114a99499a4d06e704
Merging:
d7083db038fb98266e331a7f96198ec35a12367a A partial fix BUG 061124 (crashing when 1ms interrrupts).
0215ffb08ce99e2bb59eca114a99499a4d06e704 Linux 2.6.19
found 1 common ancestor(s):
1abbfb412b1610ec3a7ec0164108cee01191d9f5 [PATCH] x86_64: fix bad page state in process 'swapper'
Auto-merging kernel/fork.c
Auto-merging kernel/spinlock.c
Merge made by recursive.
Documentation/rtc.txt | 463 ++++++++++++++++---------
Makefile | 2
arch/arm/configs/assabet_defconfig | 1
arch/arm/configs/cerfcube_defconfig | 1
arch/arm/configs/corgi_defconfig | 1
......
sound/pci/emu10k1/emu10k1_main.c | 1
sound/pci/hda/patch_realtek.c | 2
sound/pci/hda/patch_sigmatel.c | 14 -
sound/usb/usbaudio.c | 3
usr/Makefile | 2
92 files changed, 888 insertions(+), 371 deletions(-)
create mode 100644 arch/mips/kernel/topology.c
create mode 100644 arch/um/os-Linux/execvp.c
create mode 100644 include/asm-arm/mach/udc_pxa2xx.h
Thank you very much,
Wink
next prev parent reply other threads:[~2006-12-01 8:22 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-12-01 7:06 Resolving conflicts Wink Saville
2006-12-01 7:30 ` Alan Chandler
2006-12-01 7:41 ` Wink Saville
2006-12-01 8:10 ` Alan Chandler
2006-12-01 7:39 ` Linus Torvalds
2006-12-01 7:52 ` Wink Saville
2006-12-01 7:57 ` Linus Torvalds
2006-12-01 8:00 ` Linus Torvalds
2006-12-01 8:13 ` Alan Chandler
2006-12-01 8:22 ` Wink Saville [this message]
2006-12-01 23:47 ` Alan Chandler
2006-12-02 3:04 ` Wink Saville
2006-12-02 4:30 ` Linus Torvalds
2006-12-02 7:55 ` Junio C Hamano
2006-12-02 10:49 ` using xdl_merge(), was " Johannes Schindelin
2006-12-05 17:58 ` Ramsay Jones
2006-12-05 18:28 ` Linus Torvalds
2006-12-05 18:43 ` Junio C Hamano
2006-12-05 18:53 ` Johannes Schindelin
2006-12-05 19:50 ` Junio C Hamano
2006-12-05 21:15 ` [PATCH] xdl_merge(): fix and simplify conflict handling Johannes Schindelin
2006-12-05 22:10 ` Junio C Hamano
2006-12-05 22:24 ` Johannes Schindelin
2006-12-05 22:54 ` Junio C Hamano
2006-12-05 22:27 ` Jakub Narebski
2006-12-05 22:27 ` Johannes Schindelin
2006-12-06 9:48 ` using xdl_merge(), was Re: Resolving conflicts Junio C Hamano
2006-12-06 10:02 ` Johannes Schindelin
2006-12-06 10:13 ` Junio C Hamano
2006-12-06 10:47 ` Johannes Schindelin
2006-12-05 18:36 ` Johannes Schindelin
2006-12-01 7:53 ` Linus Torvalds
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=456FE642.6020102@saville.com \
--to=wink@saville.com \
--cc=git@vger.kernel.org \
--cc=torvalds@osdl.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).