From: Geoff Russell <geoffrey.russell@gmail.com>
To: Johannes Sixt <j.sixt@viscovery.net>
Cc: Tay Ray Chuan <rctay89@gmail.com>,
Nanako Shiraishi <nanako3@lavabit.com>,
git@vger.kernel.org
Subject: Re: Merging a branch when I don't want conflicts
Date: Tue, 19 May 2009 09:23:54 +0930 [thread overview]
Message-ID: <93c3eada0905181653r2694550djd2e0f75de22c156d@mail.gmail.com> (raw)
In-Reply-To: <4A112404.6060004@viscovery.net>
On Mon, May 18, 2009 at 6:31 PM, Johannes Sixt <j.sixt@viscovery.net> wrote:
> Geoff Russell schrieb:
>> The file is data coming out of an interactive program which reads
>> the entire file, edits and then writes the entire file at which point
>> this file is correct
>> and all previous versions are obsolete. I don't really want a merge
>> at all, but just
>> want to replace the file in the master with the version on the branch.
>
> Ah, so finally you say what you mean ;)
>
> You can define a custom merge driver that always returns the content of
> the second branch. See 'man gitattributes'.
>
> -- Hannes
>
Sorry for the confusion. A custom merge driver will work fine ... but I
will also rethink carefully what I am doing.
Cheers,
Geoff.
next prev parent reply other threads:[~2009-05-18 23:54 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-18 2:30 Merging a branch when I don't want conflicts Geoff Russell
2009-05-18 6:18 ` Johannes Sixt
2009-05-18 8:05 ` Geoff Russell
2009-05-18 9:01 ` Johannes Sixt
2009-05-18 23:53 ` Geoff Russell [this message]
2009-05-18 10:45 ` Nanako Shiraishi
2009-05-18 15:57 ` Tay Ray Chuan
2009-05-18 16:17 ` Junio C Hamano
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=93c3eada0905181653r2694550djd2e0f75de22c156d@mail.gmail.com \
--to=geoffrey.russell@gmail.com \
--cc=git@vger.kernel.org \
--cc=j.sixt@viscovery.net \
--cc=nanako3@lavabit.com \
--cc=rctay89@gmail.com \
/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;
as well as URLs for NNTP newsgroup(s).