From: "Catalin Marinas" <catalin.marinas@gmail.com>
To: "Clark Williams" <clark.williams@gmail.com>
Cc: "Karl Hasselström" <kha@treskal.com>, git@vger.kernel.org
Subject: Re: StGit question
Date: Fri, 12 Sep 2008 23:15:29 +0100 [thread overview]
Message-ID: <b0943d9e0809121515v53c6d593o8211b3cbbb8dfba4@mail.gmail.com> (raw)
In-Reply-To: <48CA6367.9020300@gmail.com>
On 12/09/2008, Clark Williams <clark.williams@gmail.com> wrote:
> Most of the time it's not more than one or two patches difference, so I think that it
> can be handled manually for now. I'll definitely keep an eye on sync and merge though...
As Karl said, we have some plans to allow collaboration between
multiple StGit repositories but we didn't have much time to look at it
recently. Karl's "merge" stuff looks promising though.
What "sync" does is that it allow the same set of patches between two
branches to be synchronised in case modifications happened on one of
these branches. In your situation, you would have to fetch the remote
branch, uncommit as in Karl's method and either import or sync the
remote patches with those on your local branch.
--
Catalin
next prev parent reply other threads:[~2008-09-12 22:16 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-11 17:04 StGit question Clark Williams
2008-09-12 7:51 ` Karl Hasselström
2008-09-12 12:41 ` Clark Williams
2008-09-12 15:40 ` Karl Hasselström
2008-09-12 22:15 ` Catalin Marinas [this message]
2008-09-12 22:18 ` Catalin Marinas
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=b0943d9e0809121515v53c6d593o8211b3cbbb8dfba4@mail.gmail.com \
--to=catalin.marinas@gmail.com \
--cc=clark.williams@gmail.com \
--cc=git@vger.kernel.org \
--cc=kha@treskal.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).