From: Junio C Hamano <junkio@cox.net>
To: Fredrik Kuivinen <freku045@student.liu.se>
Cc: git@vger.kernel.org
Subject: Re: Problem merging
Date: Wed, 23 Nov 2005 11:48:20 -0800 [thread overview]
Message-ID: <7vsltn403f.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <20051123085953.GA4933@c165.ib.student.liu.se> (Fredrik Kuivinen's message of "Wed, 23 Nov 2005 09:59:53 +0100")
Fredrik Kuivinen <freku045@student.liu.se> writes:
> Have you tried this merge with the recursive merge strategy?
>
> Btw is there a reason why 'recursive' isn't the default merge strategy
> for git-merge? It might be a bit confusing that git-pull and git-merge
> have different default strategies...
Agreed; will patch.
prev parent reply other threads:[~2005-11-23 19:48 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-11-23 2:50 Problem merging Luben Tuikov
2005-11-23 3:06 ` Junio C Hamano
2005-11-23 3:41 ` Luben Tuikov
2005-11-23 14:49 ` Johannes Schindelin
2005-11-24 10:54 ` Ben Clifford
2005-11-25 1:13 ` Johannes Schindelin
2005-11-25 1:35 ` Andreas Ericsson
2005-11-27 21:24 ` H. Peter Anvin
2005-11-23 8:59 ` Fredrik Kuivinen
2005-11-23 19:48 ` Junio C Hamano [this message]
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=7vsltn403f.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=freku045@student.liu.se \
--cc=git@vger.kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.