From: Tim Ottinger <tottinge@progeny.com>
To: Darrin Thompson <darrint@progeny.com>
Cc: Junio C Hamano <junkio@cox.net>, git@vger.kernel.org
Subject: Re: Merges without bases
Date: Thu, 08 Sep 2005 13:01:54 -0500 [thread overview]
Message-ID: <43207C92.4040103@progeny.com> (raw)
In-Reply-To: <1125010764.4110.35.camel@localhost.localdomain>
Darrin Thompson wrote:
>What I'm going to do is actually an inversion of that. Publishing a
>repository with the _intent_ of being merged into existing history, and
>observing obvious naming conventions as the "prior arrangement".
>
>I thought once I got the initial baseless merges done and committed that
>I do fetch-octopus from that point on. But octopus was still complaining
>about not finding a merge base. I'm going to verify that I didn't just
>mess something up in the process.
>
>If I can get octopus working as the tool for doing merges _after_ the
>baseless merges then I can live with the current situation.
>
>
Heh. Git repositories as components.
--
><>
... either 'way ahead of the game, or 'way out in left field.
next prev parent reply other threads:[~2005-09-08 18:03 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-08-25 21:10 Merges without bases Darrin Thompson
2005-08-25 21:29 ` Darrin Thompson
2005-08-25 22:26 ` Junio C Hamano
2005-08-25 22:59 ` Darrin Thompson
2005-09-08 18:01 ` Tim Ottinger [this message]
2005-08-26 4:09 ` Daniel Barkalow
2005-08-26 8:00 ` Junio C Hamano
2005-09-09 12:02 ` Eric W. Biederman
2005-08-26 9:17 ` Martin Langhoff
2005-08-26 16:37 ` Daniel Barkalow
2005-08-27 6:48 ` Martin Langhoff
2005-08-27 20:49 ` Daniel Barkalow
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=43207C92.4040103@progeny.com \
--to=tottinge@progeny.com \
--cc=darrint@progeny.com \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
/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.